diff --git a/.common-ci.yml b/.common-ci.yml index afd01f50..fb2ff90d 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -70,13 +70,6 @@ stages: DIST: debian10 PACKAGE_REPO_TYPE: debian -.dist-debian9: - rules: - - !reference [.main-or-manual, rules] - variables: - DIST: debian9 - PACKAGE_REPO_TYPE: debian - .dist-opensuse-leap15.1: rules: - !reference [.main-or-manual, rules] @@ -92,13 +85,6 @@ stages: CVE_UPDATES: "cyrus-sasl-lib" PACKAGE_REPO_TYPE: rpm -.dist-ubuntu16.04: - rules: - - !reference [.main-or-manual, rules] - variables: - DIST: ubuntu16.04 - PACKAGE_REPO_TYPE: debian - .dist-ubuntu18.04: variables: DIST: ubuntu18.04 @@ -106,8 +92,6 @@ stages: PACKAGE_REPO_TYPE: debian .dist-ubuntu20.04: - rules: - - !reference [.main-or-manual, rules] variables: DIST: ubuntu20.04 CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" @@ -252,22 +236,15 @@ release:staging-ubi8: needs: - image-ubi8 -release:staging-ubuntu18.04: - extends: - - .release:staging - - .dist-ubuntu18.04 - needs: - - test-toolkit-ubuntu18.04 - - test-containerd-ubuntu18.04 - - test-crio-ubuntu18.04 - - test-docker-ubuntu18.04 - release:staging-ubuntu20.04: extends: - .release:staging - .dist-ubuntu20.04 needs: - - image-ubuntu20.04 + - test-toolkit-ubuntu20.04 + - test-containerd-ubuntu20.04 + - test-crio-ubuntu20.04 + - test-docker-ubuntu20.04 release:staging-packaging: extends: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0517f9c7..7a338002 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,12 +116,6 @@ package-amazonlinux2-x86_64: - .dist-amazonlinux2 - .arch-x86_64 -package-centos7-ppc64le: - extends: - - .package-build - - .dist-centos7 - - .arch-ppc64le - package-centos7-x86_64: extends: - .package-build @@ -152,30 +146,12 @@ package-debian10-amd64: - .dist-debian10 - .arch-amd64 -package-debian9-amd64: - extends: - - .package-build - - .dist-debian9 - - .arch-amd64 - package-opensuse-leap15.1-x86_64: extends: - .package-build - .dist-opensuse-leap15.1 - .arch-x86_64 -package-ubuntu16.04-amd64: - extends: - - .package-build - - .dist-ubuntu16.04 - - .arch-amd64 - -package-ubuntu16.04-ppc64le: - extends: - - .package-build - - .dist-ubuntu16.04 - - .arch-ppc64le - package-ubuntu18.04-amd64: extends: - .package-build @@ -228,7 +204,6 @@ image-centos7: - .package-artifacts - .dist-centos7 needs: - - package-centos7-ppc64le - package-centos7-x86_64 image-ubi8: @@ -242,17 +217,6 @@ image-ubi8: - package-centos8-x86_64 - package-centos8-ppc64le -image-ubuntu18.04: - extends: - - .image-build - - .package-artifacts - - .dist-ubuntu18.04 - needs: - - package-ubuntu18.04-amd64 - - package-ubuntu18.04-arm64 - - job: package-ubuntu18.04-ppc64le - optional: true - image-ubuntu20.04: extends: - .image-build @@ -261,7 +225,8 @@ image-ubuntu20.04: needs: - package-ubuntu18.04-amd64 - package-ubuntu18.04-arm64 - - package-ubuntu18.04-ppc64le + - job: package-ubuntu18.04-ppc64le + optional: true # The DIST=packaging target creates an image containing all built packages image-packaging: @@ -278,22 +243,14 @@ image-packaging: optional: true - job: package-amazonlinux2-x86_64 optional: true - - job: package-centos7-ppc64le - optional: true - job: package-centos7-x86_64 optional: true - job: package-centos8-ppc64le optional: true - job: package-debian10-amd64 optional: true - - job: package-debian9-amd64 - optional: true - job: package-opensuse-leap15.1-x86_64 optional: true - - job: package-ubuntu16.04-amd64 - optional: true - - job: package-ubuntu16.04-ppc64le - optional: true - job: package-ubuntu18.04-ppc64le optional: true @@ -327,31 +284,31 @@ image-packaging: TEST_CASES: "crio" # Define the test targets -test-toolkit-ubuntu18.04: +test-toolkit-ubuntu20.04: extends: - .test:toolkit - - .dist-ubuntu18.04 + - .dist-ubuntu20.04 needs: - - image-ubuntu18.04 + - image-ubuntu20.04 -test-containerd-ubuntu18.04: +test-containerd-ubuntu20.04: extends: - .test:containerd - - .dist-ubuntu18.04 + - .dist-ubuntu20.04 needs: - - image-ubuntu18.04 + - image-ubuntu20.04 -test-crio-ubuntu18.04: +test-crio-ubuntu20.04: extends: - .test:crio - - .dist-ubuntu18.04 + - .dist-ubuntu20.04 needs: - - image-ubuntu18.04 + - image-ubuntu20.04 -test-docker-ubuntu18.04: +test-docker-ubuntu20.04: extends: - .test:docker - - .dist-ubuntu18.04 + - .dist-ubuntu20.04 needs: - - image-ubuntu18.04 + - image-ubuntu20.04 diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 1a82598a..51b3a58a 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -79,11 +79,6 @@ image-ubi8: - .dist-ubi8 - .image-pull -image-ubuntu18.04: - extends: - - .dist-ubuntu18.04 - - .image-pull - image-ubuntu20.04: extends: - .dist-ubuntu20.04 @@ -230,12 +225,12 @@ release:packages:kitmaker: extends: - .release:packages -release:staging-ubuntu18.04: +release:staging-ubuntu20.04: extends: - .release:staging - - .dist-ubuntu18.04 + - .dist-ubuntu20.04 needs: - - image-ubuntu18.04 + - image-ubuntu20.04 # Define the external release targets # Release to NGC @@ -244,11 +239,6 @@ release:ngc-centos7: - .dist-centos7 - .release:ngc -release:ngc-ubuntu18.04: - extends: - - .dist-ubuntu18.04 - - .release:ngc - release:ngc-ubuntu20.04: extends: - .dist-ubuntu20.04 diff --git a/build/container/Makefile b/build/container/Makefile index 32fd8fa6..da244a53 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -44,7 +44,7 @@ OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) ##### Public rules ##### DEFAULT_PUSH_TARGET := ubuntu20.04 -DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 +DISTRIBUTIONS := ubuntu20.04 ubi8 centos7 META_TARGETS := packaging @@ -146,10 +146,7 @@ test-packaging: @$(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/debian10/amd64" || echo "Missing debian10/amd64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian9/amd64" || echo "Missing debian9/amd64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/amd64" || echo "Missing ubuntu16.04/amd64" - @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/ppc64le" || echo "Missing ubuntu16.04/ppc64le" @$(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" diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index c1e47b82..de0d658b 100755 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -29,18 +29,12 @@ SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )" all=( amazonlinux2-aarch64 amazonlinux2-x86_64 - centos7-ppc64le centos7-x86_64 centos8-aarch64 centos8-ppc64le centos8-x86_64 debian10-amd64 - debian9-amd64 - fedora35-aarch64 - fedora35-x86_64 opensuse-leap15.1-x86_64 - ubuntu16.04-amd64 - ubuntu16.04-ppc64le ubuntu18.04-amd64 ubuntu18.04-arm64 ubuntu18.04-ppc64le diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index d15e2ae6..ee676868 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -152,18 +152,12 @@ function sync() { all=( amazonlinux2-aarch64 amazonlinux2-x86_64 - centos7-ppc64le centos7-x86_64 centos8-aarch64 centos8-ppc64le centos8-x86_64 debian10-amd64 - debian9-amd64 - fedora35-aarch64 - fedora35-x86_64 opensuse-leap15.1-x86_64 - ubuntu16.04-amd64 - ubuntu16.04-ppc64le ubuntu18.04-amd64 ubuntu18.04-arm64 ubuntu18.04-ppc64le