1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From 868a0985bf10b9c6f6139471c292f1232ee847aa Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@citrix.com>
Date: Tue, 21 Nov 2023 17:03:56 +0100
Subject: [PATCH 01/25] automation: update tests to use Debian Bookworm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Switch tests using Stretch to Bookworm, as Stretch is EOL.
Note the packages are not removed from the Stretch dockerfile, because the
tests in stable branches will run using the old containers.
[backport: leave the XTF jobs on x86 unchanged as they don't seem to
work with the newer containers]
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
master commit: b78b4de1c51b741d48817aae562d9e040b072b83
master date: 2023-11-21 17:03:56 +0100
---
automation/build/debian/bookworm.dockerfile | 5 +++++
automation/gitlab-ci/test.yaml | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index ae008c8d46..7aea081c13 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -46,6 +46,11 @@ RUN apt-get update && \
gnupg \
apt-transport-https \
golang \
+ # for test phase, qemu-smoke-* jobs
+ qemu-system-x86 \
+ # for test phase, qemu-alpine-* jobs
+ cpio \
+ busybox-static \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 61e642cce0..4d190777e1 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -43,7 +43,7 @@
.qemu-x86-64:
extends: .test-jobs-common
variables:
- CONTAINER: debian:stretch
+ CONTAINER: debian:bookworm
LOGFILE: qemu-smoke-x86-64.log
artifacts:
paths:
@@ -130,7 +130,7 @@
build-each-commit-gcc:
extends: .test-jobs-common
variables:
- CONTAINER: debian:stretch
+ CONTAINER: debian:bookworm
XEN_TARGET_ARCH: x86_64
CC: gcc
script:
@@ -419,6 +419,8 @@ qemu-alpine-x86_64-gcc:
qemu-smoke-x86-64-gcc:
extends: .qemu-x86-64
+ variables:
+ CONTAINER: debian:stretch
script:
- ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
needs:
@@ -426,6 +428,8 @@ qemu-smoke-x86-64-gcc:
qemu-smoke-x86-64-clang:
extends: .qemu-x86-64
+ variables:
+ CONTAINER: debian:stretch
script:
- ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE}
needs:
@@ -433,6 +437,8 @@ qemu-smoke-x86-64-clang:
qemu-smoke-x86-64-gcc-pvh:
extends: .qemu-x86-64
+ variables:
+ CONTAINER: debian:stretch
script:
- ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
needs:
@@ -440,6 +446,8 @@ qemu-smoke-x86-64-gcc-pvh:
qemu-smoke-x86-64-clang-pvh:
extends: .qemu-x86-64
+ variables:
+ CONTAINER: debian:stretch
script:
- ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE}
needs:
--
2.46.1
|
GitWeb