From e0888653d85896cdef8f303c087b159d063968b7 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Mon, 18 Nov 2024 14:15:37 -0600 Subject: debian-gpl: Run on debian:bullseye instead of buster * buster is now very old * all the other jobs run bullseye * This will facilitate switching to a TPA-maintained image (there is no buster image). --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82176a1bfd..b3f98173b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ debian-disable-relay: ##### # GPL licensed mode, enables pow module debian-gpl: - image: debian:buster + image: debian:bullseye <<: *debian-template variables: GPL: "yes" -- cgit v1.2.3-54-g00ecf From 4fe6ef38a205d6d4355f998b2c66311af8f3ec76 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Mon, 18 Nov 2024 13:25:13 -0600 Subject: CI: Use TPA-based images --- .gitlab-ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3f98173b1..0c2a631abf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ variables: # Minimal check on debian: just make, make check. # debian-minimal: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template script: - ./scripts/ci/ci-driver.sh @@ -128,6 +128,8 @@ debian-minimal: # Minimal check on debian/i386: just make, make check. # debian-i386-minimal: + # TODO: Use a TPA-maintained image when there is one. + # See https://gitlab.torproject.org/tpo/tpa/base-images/-/issues/3 image: i386/debian:bullseye <<: *debian-template script: @@ -141,7 +143,7 @@ debian-i386-minimal: # # TODO: This will be faster once we merge #40098 and #40099. debian-hardened: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: ALL_BUGS_ARE_FATAL: "yes" @@ -153,7 +155,7 @@ debian-hardened: ##### # Distcheck on debian stable debian-distcheck: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: DISTCHECK: "yes" @@ -164,7 +166,7 @@ debian-distcheck: ##### # Documentation tests on debian stable: doxygen and asciidoc. debian-docs: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: DOXYGEN: "yes" @@ -182,7 +184,7 @@ debian-docs: # with the 'artifacts' mechanism, in theory, but it would be good to # avoid having to have a system with hundreds of artifacts. debian-integration: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: CHECK: "no" @@ -196,7 +198,7 @@ debian-integration: ##### # Tracing build on Debian stable. debian-tracing: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: TRACING: "yes" @@ -208,7 +210,7 @@ debian-tracing: ##### # No-authority mode debian-disable-dirauth: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: DISABLE_DIRAUTH: "yes" @@ -218,7 +220,7 @@ debian-disable-dirauth: ##### # No-relay mode debian-disable-relay: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: DISABLE_RELAY: "yes" @@ -228,7 +230,7 @@ debian-disable-relay: ##### # GPL licensed mode, enables pow module debian-gpl: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: GPL: "yes" @@ -238,7 +240,7 @@ debian-gpl: ##### # NSS check on debian debian-nss: - image: debian:bullseye + image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye <<: *debian-template variables: NSS: "yes" -- cgit v1.2.3-54-g00ecf From 704540fe461dcd4f72f360334a6f2ab6a5d80e38 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Mon, 18 Nov 2024 13:58:25 -0600 Subject: debian-i386-minimal: explicitly set platform This is to work around https://github.com/docker-library/official-images/issues/17896 --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c2a631abf..b1099fa285 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,7 +130,10 @@ debian-minimal: debian-i386-minimal: # TODO: Use a TPA-maintained image when there is one. # See https://gitlab.torproject.org/tpo/tpa/base-images/-/issues/3 - image: i386/debian:bullseye + image: + name: i386/debian:bullseye + docker: + platform: linux/386 <<: *debian-template script: - ./scripts/ci/ci-driver.sh -- cgit v1.2.3-54-g00ecf