From 46b4cd7b036f5630ac4ff969a74bf99c39dd9d21 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 30 Jan 2024 12:38:52 +0100 Subject: [PATCH 1/2] Remove unused centos8 jobs This change removes the centos8-x86_64 and centos8-aarch64 pipeline jobs. These packages are no longer used since centos7 packages are used instead. Signed-off-by: Evan Lezar --- .gitlab-ci.yml | 14 -------------- DEVELOPMENT.md | 2 +- build/container/Makefile | 2 -- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29159ea2..9d9df48e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,24 +76,12 @@ package-centos7-x86_64: - .dist-centos7 - .arch-x86_64 -package-centos8-aarch64: - extends: - - .package-build - - .dist-centos8 - - .arch-aarch64 - package-centos8-ppc64le: extends: - .package-build - .dist-centos8 - .arch-ppc64le -package-centos8-x86_64: - extends: - - .package-build - - .dist-centos8 - - .arch-x86_64 - package-ubuntu18.04-amd64: extends: - .package-build @@ -176,8 +164,6 @@ image-packaging: - .package-artifacts - .dist-packaging needs: - - job: package-centos8-aarch64 - - job: package-centos8-x86_64 - job: package-ubuntu18.04-amd64 - job: package-ubuntu18.04-arm64 - job: package-amazonlinux2-aarch64 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 3d9419d1..a723fd43 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -19,7 +19,7 @@ where `TARGET` is a make target that is valid for each of the sub-components. These include: * `ubuntu18.04-amd64` -* `centos8-x86_64` +* `centos7-x86_64` If no `TARGET` is specified, all valid release targets are built. diff --git a/build/container/Makefile b/build/container/Makefile index a16a89d9..983598a3 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -145,9 +145,7 @@ test-packaging: @echo "Testing package image contents" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/aarch64" || echo "Missing centos7/aarch64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/x86_64" || echo "Missing centos7/x86_64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/aarch64" || echo "Missing centos8/aarch64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/x86_64" || echo "Missing centos8/x86_64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/amd64" || echo "Missing ubuntu18.04/amd64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/arm64" || echo "Missing ubuntu18.04/arm64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/ppc64le" || echo "Missing ubuntu18.04/ppc64le" From 5a70e755477c3fd350b5e743826d37c317b7b0a3 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 30 Jan 2024 12:39:22 +0100 Subject: [PATCH 2/2] Use stable/rpm repo for release tests Signed-off-by: Evan Lezar --- test/release/docker/centos8/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/release/docker/centos8/Dockerfile b/test/release/docker/centos8/Dockerfile index ab2152c8..b8ec62c5 100644 --- a/test/release/docker/centos8/Dockerfile +++ b/test/release/docker/centos8/Dockerfile @@ -25,7 +25,7 @@ RUN fpm -s empty \ rm -f /tmp/docker.rpm -RUN curl -s -L https://nvidia.github.io/libnvidia-container/centos8/libnvidia-container.repo \ +RUN curl -s -L https://nvidia.github.io/libnvidia-container/stable/rpm/libnvidia-container.repo \ | tee /etc/yum.repos.d/nvidia-container-toolkit.repo COPY entrypoint.sh /