Changeset b8eadb55 in OpenModelica

Timestamp:

2021-01-22T13:43:16+01:00 (3 years ago)

Author:

Andreas <38031952+AnHeuermann@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

60f3fc1

Parents:

c2c52350

git-author:

AnHeuermann <andreas.heuermann@…> (01/13/21 16:03:31)

git-committer:

Andreas <38031952+AnHeuermann@…> (01/22/21 13:43:16)

Message:

Replace CI test for CentOS6 with CentOS7

• CentOS6 reached end of live

Files:

• .CI/cache-centos7/Dockerfile (moved) (moved from .CI/cache-centos6/Dockerfile) (1 diff)
• .CI/common.groovy (modified) (2 diffs)
• Jenkinsfile (modified) (6 diffs)

.CI/cache-centos7/Dockerfile

@@ -1 @@
-FROM docker.openmodelica.org/build-deps:el6.amd64
+FROM docker.openmodelica.org/build-deps:el7.amd64
 
 # Install git, zip

.CI/common.groovy

@@ -466 +466 @@
 }
 
-def shouldWeBuildCENTOS6() {
+def shouldWeBuildCENTOS7() {
   if (isPR()) {
     if (pullRequest.labels.contains("CI/Build CentOS")) {
@@ -472 +472 @@
     }
   }
-  return params.BUILD_CENTOS6
+  return params.BUILD_CENTOS7
 }
 

Jenkinsfile

@@ -2 +2 @@
 def shouldWeBuildOSX
 def shouldWeBuildMINGW
-def shouldWeBuildCENTOS6
+def shouldWeBuildCENTOS7
 def shouldWeRunTests
 def isPR
@@ -16 +16 @@
     booleanParam(name: 'BUILD_OSX', defaultValue: false, description: 'Build with OSX')
     booleanParam(name: 'BUILD_MINGW', defaultValue: false, description: 'Build with Win/MinGW')
-    booleanParam(name: 'BUILD_CENTOS6', defaultValue: false, description: 'Build on CentOS6 with CMake2.8')
+    booleanParam(name: 'BUILD_CENTOS7', defaultValue: false, description: 'Build on CentOS7 with CMake 2.8')
   }
   // stages are ordered according to execution time; highest time first
@@ -39 +39 @@
           shouldWeBuildMINGW = common.shouldWeBuildMINGW()
           print "shouldWeBuildMINGW: ${shouldWeBuildMINGW}"
-          shouldWeBuildCENTOS6 = common.shouldWeBuildCENTOS6()
-          print "shouldWeBuildCENTOS6: ${shouldWeBuildCENTOS6}"
+          shouldWeBuildCENTOS7 = common.shouldWeBuildCENTOS7()
+          print "shouldWeBuildCENTOS7: ${shouldWeBuildCENTOS7}"
           shouldWeRunTests = common.shouldWeRunTests()
           print "shouldWeRunTests: ${shouldWeRunTests}"
@@ -145 +145 @@
           }
         }
-        stage('CentOS6') {
+        stage('CentOS7') {
           agent {
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-centos6'
+              dir '.CI/cache-centos7'
               label 'linux'
               args "-v /var/lib/jenkins/gitcache:/var/lib/jenkins/gitcache"
@@ -156 +156 @@
           when {
             beforeAgent true
-            expression { shouldWeBuildCENTOS6 }
+            expression { shouldWeBuildCENTOS7 }
           }
           environment {
@@ -170 +170 @@
                 false)  // Building C++ runtime doesn't work at the moment
             }
-            //stash name: 'omc-centos6', includes: 'build/**, **/config.status'
+            //stash name: 'omc-centos7', includes: 'build/**, **/config.status'
           }
         }