Skip to content

Commit b8eadb5

Browse files
AnHeuermannAnHeuermann
authored andcommitted
Replace CI test for CentOS6 with CentOS7
- CentOS6 reached end of live
1 parent c2c5235 commit b8eadb5

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.CI/cache-centos6/Dockerfile renamed to .CI/cache-centos7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.openmodelica.org/build-deps:el6.amd64
1+
FROM docker.openmodelica.org/build-deps:el7.amd64
22

33
# Install git, zip
44
RUN yum -y install git zip

.CI/common.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,13 @@ def shouldWeBuildMINGW() {
465465
return params.BUILD_MINGW
466466
}
467467

468-
def shouldWeBuildCENTOS6() {
468+
def shouldWeBuildCENTOS7() {
469469
if (isPR()) {
470470
if (pullRequest.labels.contains("CI/Build CentOS")) {
471471
return true
472472
}
473473
}
474-
return params.BUILD_CENTOS6
474+
return params.BUILD_CENTOS7
475475
}
476476

477477
def shouldWeRunTests() {

Jenkinsfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def common
22
def shouldWeBuildOSX
33
def shouldWeBuildMINGW
4-
def shouldWeBuildCENTOS6
4+
def shouldWeBuildCENTOS7
55
def shouldWeRunTests
66
def isPR
77
pipeline {
@@ -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

Comments
 (0)