Skip to content

Commit a2c8052

Browse files
jgaajgaa
committed
Removed Debian Buster from testing. Added Debian Trixie
1 parent 4613aec commit a2c8052

2 files changed

Lines changed: 24 additions & 58 deletions

File tree

ci/jenkins/Dockefile.debian-buster renamed to ci/jenkins/Dockefile.debian-trixie

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM debian:buster
1+
FROM debian:trixie
22

33
MAINTAINER Jarle Aase <jgaa@jgaa.com>
44

55
# In case you need proxy
66
RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
77
DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
8-
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q \
8+
DEBIAN_FRONTEND="noninteractive" apt-get install -y -q\
99
openssh-server g++ git \
1010
build-essential \
11-
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev libgtest-dev \
11+
zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
1212
default-jdk &&\
1313
apt-get -y -q autoremove &&\
1414
apt-get -y -q clean

‎ci/jenkins/Jenkinsfile.groovy‎

Lines changed: 21 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -222,44 +222,11 @@ pipeline {
222222
}
223223
}
224224

225-
stage('Debian Buster ') {
226-
agent {
227-
dockerfile {
228-
filename 'Dockefile.debian-buster'
229-
dir 'ci/jenkins'
230-
label 'docker'
231-
args '-u root'
232-
}
233-
}
234-
235-
options {
236-
timeout(time: 30, unit: "MINUTES")
237-
}
238-
239-
steps {
240-
echo "Building on debian-buster-AMD64 in ${WORKSPACE}"
241-
checkout scm
242-
sh 'pwd; ls -la'
243-
sh 'rm -rf build'
244-
sh 'mkdir build'
245-
sh 'cd build && cmake -DGTEST_TAG=release-1.12.0 -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
246-
247-
echo 'Getting ready to run tests'
248-
script {
249-
try {
250-
sh 'cd build && ctest --no-compress-output -T Test'
251-
} catch (exc) {
252-
253-
unstable(message: "${STAGE_NAME} - Testing failed")
254-
}
255-
}
256-
}
257-
}
258225

259-
stage('Debian Buster MT CTX') {
226+
stage('Debian Bullseye') {
260227
agent {
261228
dockerfile {
262-
filename 'Dockefile.debian-buster'
229+
filename 'Dockefile.debian-bullseye'
263230
dir 'ci/jenkins'
264231
label 'docker'
265232
args '-u root'
@@ -271,12 +238,12 @@ pipeline {
271238
}
272239

273240
steps {
274-
echo "Building on debian-buster-AMD64 in ${WORKSPACE}"
241+
echo "Building on debian-bullseye-AMD64 in ${WORKSPACE}"
275242
checkout scm
276243
sh 'pwd; ls -la'
277244
sh 'rm -rf build'
278245
sh 'mkdir build'
279-
sh 'cd build && cmake -DGTEST_TAG=release-1.12.0 -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
246+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
280247

281248
echo 'Getting ready to run tests'
282249
script {
@@ -290,10 +257,10 @@ pipeline {
290257
}
291258
}
292259

293-
stage('Debian Buster MT CTX C++14') {
260+
stage('Debian Bullseye MT CTX') {
294261
agent {
295262
dockerfile {
296-
filename 'Dockefile.debian-buster'
263+
filename 'Dockefile.debian-bullseye'
297264
dir 'ci/jenkins'
298265
label 'docker'
299266
args '-u root'
@@ -305,12 +272,12 @@ pipeline {
305272
}
306273

307274
steps {
308-
echo "Building on debian-buster-AMD64 in ${WORKSPACE}"
275+
echo "Building on debian-bullseye-AMD64 in ${WORKSPACE}"
309276
checkout scm
310277
sh 'pwd; ls -la'
311278
sh 'rm -rf build'
312279
sh 'mkdir build'
313-
sh 'cd build && cmake -DGTEST_TAG=release-1.12.0 -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release -DRESTC_CPP_USE_CPP14=ON .. && make -j $(nproc)'
280+
sh 'cd build && cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
314281

315282
echo 'Getting ready to run tests'
316283
script {
@@ -324,23 +291,22 @@ pipeline {
324291
}
325292
}
326293

327-
stage('Debian Bullseye') {
294+
stage('Debian Bookworm') {
328295
agent {
329296
dockerfile {
330-
filename 'Dockefile.debian-bullseye'
297+
filename 'Dockefile.debian-bookworm'
331298
dir 'ci/jenkins'
332299
label 'docker'
333300
args '-u root'
334301
}
335302
}
336303

337-
338304
options {
339305
timeout(time: 30, unit: "MINUTES")
340306
}
341307

342308
steps {
343-
echo "Building on debian-bullseye-AMD64 in ${WORKSPACE}"
309+
echo "Building on debian-bookworm-AMD64 in ${WORKSPACE}"
344310
checkout scm
345311
sh 'pwd; ls -la'
346312
sh 'rm -rf build'
@@ -359,10 +325,10 @@ pipeline {
359325
}
360326
}
361327

362-
stage('Debian Bullseye MT CTX') {
328+
stage('Debian Bookworm MT CTX') {
363329
agent {
364330
dockerfile {
365-
filename 'Dockefile.debian-bullseye'
331+
filename 'Dockefile.debian-bookworm'
366332
dir 'ci/jenkins'
367333
label 'docker'
368334
args '-u root'
@@ -374,12 +340,12 @@ pipeline {
374340
}
375341

376342
steps {
377-
echo "Building on debian-bullseye-AMD64 in ${WORKSPACE}"
343+
echo "Building on debian-bookworm-AMD64 in ${WORKSPACE}"
378344
checkout scm
379345
sh 'pwd; ls -la'
380346
sh 'rm -rf build'
381347
sh 'mkdir build'
382-
sh 'cd build && cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
348+
sh 'cd build && cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
383349

384350
echo 'Getting ready to run tests'
385351
script {
@@ -393,10 +359,10 @@ pipeline {
393359
}
394360
}
395361

396-
stage('Debian Bookworm') {
362+
stage('Debian Trixie') {
397363
agent {
398364
dockerfile {
399-
filename 'Dockefile.debian-bookworm'
365+
filename 'Dockefile.debian-trixie'
400366
dir 'ci/jenkins'
401367
label 'docker'
402368
args '-u root'
@@ -408,7 +374,7 @@ pipeline {
408374
}
409375

410376
steps {
411-
echo "Building on debian-bookworm-AMD64 in ${WORKSPACE}"
377+
echo "Building on debian-trixie-AMD64 in ${WORKSPACE}"
412378
checkout scm
413379
sh 'pwd; ls -la'
414380
sh 'rm -rf build'
@@ -427,10 +393,10 @@ pipeline {
427393
}
428394
}
429395

430-
stage('Debian Bookworm MT CTX') {
396+
stage('Debian Trixie MT CTX') {
431397
agent {
432398
dockerfile {
433-
filename 'Dockefile.debian-bookworm'
399+
filename 'Dockefile.debian-trixie'
434400
dir 'ci/jenkins'
435401
label 'docker'
436402
args '-u root'
@@ -442,7 +408,7 @@ pipeline {
442408
}
443409

444410
steps {
445-
echo "Building on debian-bookworm-AMD64 in ${WORKSPACE}"
411+
echo "Building on debian-trixie-AMD64 in ${WORKSPACE}"
446412
checkout scm
447413
sh 'pwd; ls -la'
448414
sh 'rm -rf build'

0 commit comments

Comments
 (0)