| Message ID | 20231116121310.72210-5-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | automation: minor fixes and improvements | expand |
On Thu, 16 Nov 2023, Roger Pau Monne wrote: > 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. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > The Bookworm container needs to be updated to contain the required tools before > pushing this change. I'll do that after the release just to stay on the safe side > --- > automation/build/debian/bookworm.dockerfile | 5 +++++ > automation/gitlab-ci/test.yaml | 4 ++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile > index ae008c8d46e5..7aea081c13a9 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 61e642cce0cc..6aabdb9d156f 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: > -- > 2.42.0 >
diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index ae008c8d46e5..7aea081c13a9 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 61e642cce0cc..6aabdb9d156f 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:
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. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- The Bookworm container needs to be updated to contain the required tools before pushing this change. --- automation/build/debian/bookworm.dockerfile | 5 +++++ automation/gitlab-ci/test.yaml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)