11def common
22def shouldWeBuildOSX
33def shouldWeBuildMINGW
4- def shouldWeBuildCENTOS6
4+ def shouldWeBuildCENTOS7
55def shouldWeRunTests
66def isPR
77pipeline {
@@ -15,7 +15,7 @@ pipeline {
1515 parameters {
1616 booleanParam(name : ' BUILD_OSX' , defaultValue : false , description : ' Build with OSX' )
1717 booleanParam(name : ' BUILD_MINGW' , defaultValue : false , description : ' Build with Win/MinGW' )
18- booleanParam(name : ' BUILD_CENTOS6 ' , defaultValue : false , description : ' Build on CentOS6 with CMake2 .8' )
18+ booleanParam(name : ' BUILD_CENTOS7 ' , defaultValue : false , description : ' Build on CentOS7 with CMake 2 .8' )
1919 }
2020 // stages are ordered according to execution time; highest time first
2121 // nodes are selected based on a priority (in Jenkins config)
@@ -38,8 +38,8 @@ pipeline {
3838 print " shouldWeBuildOSX: ${ shouldWeBuildOSX} "
3939 shouldWeBuildMINGW = common. shouldWeBuildMINGW()
4040 print " shouldWeBuildMINGW: ${ shouldWeBuildMINGW} "
41- shouldWeBuildCENTOS6 = common. shouldWeBuildCENTOS6 ()
42- print " shouldWeBuildCENTOS6 : ${ shouldWeBuildCENTOS6 } "
41+ shouldWeBuildCENTOS7 = common. shouldWeBuildCENTOS7 ()
42+ print " shouldWeBuildCENTOS7 : ${ shouldWeBuildCENTOS7 } "
4343 shouldWeRunTests = common. shouldWeRunTests()
4444 print " shouldWeRunTests: ${ shouldWeRunTests} "
4545 }
@@ -144,18 +144,18 @@ pipeline {
144144 }
145145 }
146146 }
147- stage(' CentOS6 ' ) {
147+ stage(' CentOS7 ' ) {
148148 agent {
149149 dockerfile {
150150 additionalBuildArgs ' --pull'
151- dir ' .CI/cache-centos6 '
151+ dir ' .CI/cache-centos7 '
152152 label ' linux'
153153 args " -v /var/lib/jenkins/gitcache:/var/lib/jenkins/gitcache"
154154 }
155155 }
156156 when {
157157 beforeAgent true
158- expression { shouldWeBuildCENTOS6 }
158+ expression { shouldWeBuildCENTOS7 }
159159 }
160160 environment {
161161 QTDIR = " /usr/lib64/qt5/"
@@ -169,7 +169,7 @@ pipeline {
169169 ' FC=/opt/rh/devtoolset-8/root/usr/bin/gfortran' ,
170170 false ) // Building C++ runtime doesn't work at the moment
171171 }
172- // stash name: 'omc-centos6 ', includes: 'build/**, **/config.status'
172+ // stash name: 'omc-centos7 ', includes: 'build/**, **/config.status'
173173 }
174174 }
175175 stage(' checks' ) {
0 commit comments