diff --git a/.common-ci.yml b/.common-ci.yml index 93c575ce..e9ab8ef5 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -210,13 +210,6 @@ release:staging-centos7: needs: - image-centos7 -release:staging-centos8: - extends: - - .release:staging - - .dist-centos8 - needs: - - image-centos8 - release:staging-ubi8: extends: - .release:staging diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9716b97d..919d6588 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -231,16 +231,6 @@ image-centos7: - package-centos7-ppc64le - package-centos7-x86_64 -image-centos8: - extends: - - .image-build - - .package-artifacts - - .dist-centos8 - needs: - - package-centos8-aarch64 - - package-centos8-x86_64 - - package-centos8-ppc64le - image-ubi8: extends: - .image-build diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 3f778cdf..55f9ad4e 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -70,11 +70,6 @@ image-centos7: - .image-pull - .dist-centos7 -image-centos8: - extends: - - .image-pull - - .dist-centos8 - image-ubi8: extends: - .image-pull @@ -154,23 +149,6 @@ scan-centos7-arm64: - image-centos7 - scan-centos7-amd64 -scan-centos8-amd64: - extends: - - .scan - - .dist-centos8 - - .platform-amd64 - needs: - - image-centos8 - -scan-centos8-arm64: - extends: - - .scan - - .dist-centos8 - - .platform-arm64 - needs: - - image-centos8 - - scan-centos8-amd64 - scan-ubuntu18.04-amd64: extends: - .scan @@ -253,11 +231,6 @@ release:ngc-centos7: - .release:ngc - .dist-centos7 -release:ngc-centos8: - extends: - - .release:ngc - - .dist-centos8 - release:ngc-ubuntu18.04: extends: - .release:ngc diff --git a/build/container/Makefile b/build/container/Makefile index 3b523954..db0955e4 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 := ubuntu18.04 -DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8 +DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 META_TARGETS := packaging @@ -115,11 +115,6 @@ build-centos7: DOCKERFILE_SUFFIX := centos build-centos7: PACKAGE_DIST = $(BASE_DIST) build-centos7: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) -build-centos8: BASE_DIST := ubi8 -build-centos8: DOCKERFILE_SUFFIX := centos -build-centos8: PACKAGE_DIST = centos8 -build-centos8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) - build-packaging: BASE_DIST := ubuntu20.04 build-packaging: DOCKERFILE_SUFFIX := packaging build-packaging: PACKAGE_ARCH := amd64