Skip to content

Commit d8fb273

Browse files
AnHeuermannAnHeuermann
authored
Update Docker images to Jammy (#11027)
* Updating Docker images to docker.openmodelica.org/build-deps:v1.22.1 - Removed all outdated Docker images (reached EOL) * Updating Jenkinsfile to use build-deps:v1.22.0 * Updating autoconf * No more Xenial, no more gcc 5 🎉 * No more special path for CMake * Update Inkscape commands - "--file / -f" is depreacted - "--export-pdf" and so on are deprecated * Fixing User's Guide - Updated commands to Inkscape 1.0 - Updated Pandoc command - Don't use .* file extension in rst files (breaks pdf) - Changed all figures to png * Updating MSL32 test to verify * Cheat and only run OpenCL on Intel * Fixing tests * Fixing OpenCL warnings - Removed sin,cos re-definition - Added -Werror to show all warnings by makin them errors * Remove failing C++ HPCOM test
1 parent 9c4c99f commit d8fb273

File tree

40 files changed

+99
-470
lines changed

40 files changed

+99
-470
lines changed

‎.CI/Jenkinsfile.more-compilers‎

Lines changed: 0 additions & 207 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ pipeline {
55
newContainerPerStage()
66
buildDiscarder(logRotator(numToKeepStr: "100", artifactNumToKeepStr: "2"))
77
}
8-
environment {
9-
LC_ALL = 'C.UTF-8'
10-
}
118
// stages are ordered according to execution time; highest time first
129
// nodes are selected based on a priority (in Jenkins config)
1310
stages {
@@ -28,215 +25,11 @@ pipeline {
2825
}
2926
stage('builds') {
3027
parallel {
31-
stage('clang-32bit') {
32-
agent {
33-
dockerfile {
34-
additionalBuildArgs '--pull'
35-
dir '.CI/cache-32'
36-
label 'linux'
37-
args "--mount type=volume,source=runtest-clang-32-cache,target=/cache/runtest " +
38-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
39-
"--privileged"
40-
}
41-
}
42-
environment {
43-
RUNTESTDB = "/cache/runtest/"
44-
LIBRARIES = "/cache/omlibrary"
45-
}
46-
steps {
47-
script {
48-
common.buildOMC('clang', 'clang++', '--without-hwloc')
49-
common.makeLibsAndCache()
50-
common.buildGUI('')
51-
common.partest()
52-
}
53-
}
54-
}
55-
// gcc-4.9 jessie
56-
stage('gcc-4.9 (Debian Jessie)') {
57-
agent {
58-
dockerfile {
59-
additionalBuildArgs '--pull'
60-
dir '.CI/cache-jessie'
61-
label 'linux'
62-
args "--mount type=volume,source=runtest-gcc-4.9-cache,target=/cache/runtest " +
63-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
64-
}
65-
}
66-
environment {
67-
RUNTESTDB = "/cache/runtest/"
68-
LIBRARIES = "/cache/omlibrary"
69-
HOME = "/cache/runtest"
70-
}
71-
steps {
72-
script {
73-
// Otherwise old git fails to clone...
74-
sh 'git config --global user.name OpenModelica'
75-
sh 'git config --global user.email openmodelica@ida.liu.se'
76-
common.buildOMC('gcc-4.9', 'g++-4.9', '--without-hwloc')
77-
common.makeLibsAndCache()
78-
common.buildGUI('')
79-
common.partest()
80-
}
81-
}
82-
}
83-
stage('clang-3.5 (Debian Jessie)') {
84-
agent {
85-
dockerfile {
86-
additionalBuildArgs '--pull'
87-
dir '.CI/cache-jessie'
88-
label 'linux'
89-
args "--mount type=volume,source=runtest-clang-3.5-cache,target=/cache/runtest " +
90-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
91-
}
92-
}
93-
environment {
94-
RUNTESTDB = "/cache/runtest/"
95-
LIBRARIES = "/cache/omlibrary"
96-
HOME = "/cache/runtest"
97-
}
98-
steps {
99-
script {
100-
// Otherwise old git fails to clone...
101-
sh 'git config --global user.name OpenModelica'
102-
sh 'git config --global user.email openmodelica@ida.liu.se'
103-
common.buildOMC('clang-3.5', 'clang++-3.5', '--without-hwloc')
104-
common.makeLibsAndCache()
105-
common.buildGUI('')
106-
common.partest()
107-
}
108-
}
109-
}
110-
// gcc-5 Ubuntu Xenial
111-
stage('gcc-5') {
112-
steps {
113-
print "Ubuntu Xenial GCC 5 tested on every pull request"
114-
}
115-
}
116-
stage('clang-3.8 (Ubuntu Xenial)') {
117-
agent {
118-
dockerfile {
119-
additionalBuildArgs '--pull'
120-
dir '.CI/cache-xenial'
121-
label 'linux'
122-
args "--mount type=volume,source=runtest-clang-3.8-cache,target=/cache/runtest " +
123-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
124-
}
125-
}
126-
environment {
127-
RUNTESTDB = "/cache/runtest/"
128-
LIBRARIES = "/cache/omlibrary"
129-
}
130-
steps {
131-
script {
132-
common.buildOMC('clang-3.8', 'clang++-3.8', '--without-hwloc')
133-
common.makeLibsAndCache()
134-
common.buildGUI('')
135-
common.partest()
136-
}
137-
}
138-
}
139-
// gcc-6 Debian stretch
140-
stage('gcc-6 (Debian Stretch)') {
141-
agent {
142-
dockerfile {
143-
additionalBuildArgs '--pull'
144-
dir '.CI/cache-stretch'
145-
label 'linux'
146-
args "--mount type=volume,source=runtest-gcc-6-cache,target=/cache/runtest " +
147-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
148-
}
149-
}
150-
environment {
151-
RUNTESTDB = "/cache/runtest/"
152-
LIBRARIES = "/cache/omlibrary"
153-
}
154-
steps {
155-
script {
156-
common.buildOMC('gcc-6', 'g++-6', '--without-hwloc')
157-
common.makeLibsAndCache()
158-
common.buildGUI('')
159-
common.partest()
160-
}
161-
}
162-
}
163-
// clang 3.8 also in Debian stretch...
164-
// gcc-7 Ubuntu Bionic
165-
stage('gcc-7 (Ubuntu Bionic)') {
166-
agent {
167-
dockerfile {
168-
additionalBuildArgs '--pull'
169-
dir '.CI/cache'
170-
label 'linux'
171-
args "--mount type=volume,source=runtest-gcc-7-cache,target=/cache/runtest " +
172-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
173-
}
174-
}
175-
environment {
176-
RUNTESTDB = "/cache/runtest/"
177-
LIBRARIES = "/cache/omlibrary"
178-
}
179-
steps {
180-
script {
181-
common.buildOMC('gcc-7', 'g++-7', '--without-hwloc')
182-
common.makeLibsAndCache()
183-
common.buildGUI('')
184-
common.partest()
185-
}
186-
}
187-
}
18828
stage('clang-6.0') {
18929
steps {
19030
print "Ubuntu Bionic clang 6.0 tested on every pull request"
19131
}
19232
}
193-
// gcc-8 in Ubuntu Disco
194-
stage('gcc-8 (Ubuntu Disco)') {
195-
agent {
196-
dockerfile {
197-
additionalBuildArgs '--pull'
198-
dir '.CI/cache-disco'
199-
label 'linux'
200-
args "--mount type=volume,source=runtest-gcc-8-cache,target=/cache/runtest " +
201-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
202-
}
203-
}
204-
environment {
205-
RUNTESTDB = "/cache/runtest/"
206-
LIBRARIES = "/cache/omlibrary"
207-
}
208-
steps {
209-
script {
210-
common.buildOMC('gcc-8', 'g++-8', '')
211-
common.makeLibsAndCache()
212-
common.buildGUI('')
213-
common.partest()
214-
}
215-
}
216-
}
217-
stage('clang-8 (Ubuntu Disco)') {
218-
agent {
219-
dockerfile {
220-
additionalBuildArgs '--pull'
221-
dir '.CI/cache-disco'
222-
label 'linux'
223-
args "--mount type=volume,source=runtest-clang-8-cache,target=/cache/runtest " +
224-
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
225-
}
226-
}
227-
environment {
228-
RUNTESTDB = "/cache/runtest/"
229-
LIBRARIES = "/cache/omlibrary"
230-
}
231-
steps {
232-
script {
233-
common.buildOMC('clang-8', 'clang++-8', '')
234-
common.makeLibsAndCache()
235-
common.buildGUI('')
236-
common.partest()
237-
}
238-
}
239-
}
24033
}
24134
}
24235
}

‎.CI/cache-32/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache-bionic-cmake-3.17.2/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache-disco/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache-jessie/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache-stretch/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache-xenial/Dockerfile‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.CI/cache/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Cannot be parametrized in Jenkins...
2-
FROM docker.openmodelica.org/build-deps:v1.16.4
2+
FROM docker.openmodelica.org/build-deps:v1.22.1
33

44
# We don't know the uid of the user who will build, so make the /cache directories world writable
55

‎.CI/clang-tools/Dockerfile‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.CI/cmake/Jenkinsfile.cmake.ubuntu.gcc.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ pipeline {
2222
}
2323
stage('build') {
2424
parallel {
25-
stage('autoconf-bionic-gcc') {
25+
stage('autoconf-jammy-gcc') {
2626
agent {
2727
docker {
28-
image 'docker.openmodelica.org/build-deps:v1.16.3'
28+
image 'docker.openmodelica.org/build-deps:v1.22.1'
2929
label 'linux'
3030
alwaysPull true
3131
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
@@ -37,11 +37,11 @@ pipeline {
3737
stash name: 'omc-gcc', includes: 'build/bin/OMCppOSUSimulation, build/include/omc/omsi/**, build/include/omc/omsic/**, build/lib/x86_64-linux-gnu/omc/omsi/**, build/lib/x86_64-linux-gnu/omc/omsicpp/**, **/config.status'
3838
}
3939
}
40-
stage('cmake-bionic-gcc') {
40+
stage('cmake-jammy-gcc') {
4141
agent {
4242
dockerfile {
4343
additionalBuildArgs '--pull'
44-
dir '.CI/cache-bionic-cmake-3.17.2'
44+
dir '.CI/cache'
4545
label 'linux'
4646
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
4747
"-v /var/lib/jenkins/gitcache:/var/lib/jenkins/gitcache"
@@ -68,7 +68,7 @@ pipeline {
6868
agent {
6969
dockerfile {
7070
additionalBuildArgs '--pull'
71-
dir '.CI/cache-bionic-cmake-3.17.2'
71+
dir '.CI/cache'
7272
label 'linux'
7373
args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
7474
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
@@ -93,7 +93,7 @@ pipeline {
9393
agent {
9494
dockerfile {
9595
additionalBuildArgs '--pull'
96-
dir '.CI/cache-bionic-cmake-3.17.2'
96+
dir '.CI/cache'
9797
label 'linux'
9898
args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
9999
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
@@ -118,7 +118,7 @@ pipeline {
118118
agent {
119119
dockerfile {
120120
additionalBuildArgs '--pull'
121-
dir '.CI/cache-bionic-cmake-3.17.2'
121+
dir '.CI/cache'
122122
label 'linux'
123123
args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
124124
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +

0 commit comments

Comments
 (0)