diff --git a/.common-ci.yml b/.common-ci.yml index 157da324..a9a51a8c 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -75,6 +75,11 @@ stages: DIST: ubuntu18.04 CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" +.dist-ubuntu20.04: + variables: + DIST: ubuntu20.04 + CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" + .dist-packaging: variables: DIST: packaging @@ -229,6 +234,16 @@ release:staging-ubuntu18.04: - test-crio-ubuntu18.04 - test-docker-ubuntu18.04 +release:staging-ubuntu20.04: + extends: + - .release:staging + - .dist-ubuntu20.04 + needs: + - test-toolkit-ubuntu20.04 + - test-containerd-ubuntu20.04 + - test-crio-ubuntu20.04 + - test-docker-ubuntu20.04 + release:staging-packaging: extends: - .release:staging diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 522b2399..86e893d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -262,6 +262,16 @@ image-ubuntu18.04: - package-ubuntu18.04-arm64 - package-ubuntu18.04-ppc64le +image-ubuntu20.04: + extends: + - .image-build + - .package-artifacts + - .dist-ubuntu20.04 + needs: + - package-ubuntu18.04-amd64 + - package-ubuntu18.04-arm64 + - package-ubuntu18.04-ppc64le + # The DIST=packaging target creates an image containing all built packages image-packaging: extends: @@ -343,3 +353,31 @@ test-docker-ubuntu18.04: needs: - image-ubuntu18.04 +test-toolkit-ubuntu20.04: + extends: + - .test:toolkit + - .dist-ubuntu20.04 + needs: + - image-ubuntu20.04 + +test-containerd-ubuntu20.04: + extends: + - .test:containerd + - .dist-ubuntu20.04 + needs: + - image-ubuntu20.04 + +test-crio-ubuntu20.04: + extends: + - .test:crio + - .dist-ubuntu20.04 + needs: + - image-ubuntu20.04 + +test-docker-ubuntu20.04: + extends: + - .test:docker + - .dist-ubuntu20.04 + needs: + - image-ubuntu20.04 + diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 87ff1445..768b628d 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -85,6 +85,11 @@ image-ubuntu18.04: - .image-pull - .dist-ubuntu18.04 +image-ubuntu20.04: + extends: + - .image-pull + - .dist-ubuntu20.04 + # The DIST=packaging target creates an image containing all built packages image-packaging: extends: @@ -183,6 +188,23 @@ scan-ubuntu18.04-arm64: - image-ubuntu18.04 - scan-ubuntu18.04-amd64 +scan-ubuntu20.04-amd64: + extends: + - .scan + - .dist-ubuntu20.04 + - .platform-amd64 + needs: + - image-ubuntu20.04 + +scan-ubuntu20.04-arm64: + extends: + - .scan + - .dist-ubuntu20.04 + - .platform-arm64 + needs: + - image-ubuntu20.04 + - scan-ubuntu20.04-amd64 + scan-ubi8-amd64: extends: - .scan @@ -226,6 +248,13 @@ release:staging-ubuntu18.04: needs: - image-ubuntu18.04 +release:staging-ubuntu20.04: + extends: + - .release:staging + - .dist-ubuntu20.04 + needs: + - image-ubuntu20.04 + # Define the external release targets # Release to NGC release:ngc-centos7: @@ -238,11 +267,16 @@ release:ngc-centos8: - .release:ngc - .dist-centos8 -release:ngc-ubuntu18: +release:ngc-ubuntu18.04: extends: - .release:ngc - .dist-ubuntu18.04 +release:ngc-ubuntu20.04: + extends: + - .release:ngc + - .dist-ubuntu20.04 + release:ngc-ubi8: extends: - .release:ngc @@ -259,11 +293,16 @@ release:dockerhub-centos8: - .release:dockerhub - .dist-centos8 -release:dockerhub-ubuntu18: +release:dockerhub-ubuntu18.04: extends: - .release:dockerhub - .dist-ubuntu18.04 +release:dockerhub-ubuntu20.04: + extends: + - .release:dockerhub + - .dist-ubuntu20.04 + release:dockerhub-ubi8: extends: - .release:dockerhub