Add CI definitions for building and publishing Ubuntu20.04 images

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-03-18 13:50:24 +02:00
parent cc68635c70
commit 4a3b532c29
3 changed files with 94 additions and 2 deletions

View File

@ -75,6 +75,11 @@ stages:
DIST: ubuntu18.04 DIST: ubuntu18.04
CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
.dist-ubuntu20.04:
variables:
DIST: ubuntu20.04
CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
.dist-packaging: .dist-packaging:
variables: variables:
DIST: packaging DIST: packaging
@ -229,6 +234,16 @@ release:staging-ubuntu18.04:
- test-crio-ubuntu18.04 - test-crio-ubuntu18.04
- test-docker-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: release:staging-packaging:
extends: extends:
- .release:staging - .release:staging

View File

@ -262,6 +262,16 @@ image-ubuntu18.04:
- package-ubuntu18.04-arm64 - package-ubuntu18.04-arm64
- package-ubuntu18.04-ppc64le - 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 # The DIST=packaging target creates an image containing all built packages
image-packaging: image-packaging:
extends: extends:
@ -343,3 +353,31 @@ test-docker-ubuntu18.04:
needs: needs:
- image-ubuntu18.04 - 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

View File

@ -85,6 +85,11 @@ image-ubuntu18.04:
- .image-pull - .image-pull
- .dist-ubuntu18.04 - .dist-ubuntu18.04
image-ubuntu20.04:
extends:
- .image-pull
- .dist-ubuntu20.04
# The DIST=packaging target creates an image containing all built packages # The DIST=packaging target creates an image containing all built packages
image-packaging: image-packaging:
extends: extends:
@ -183,6 +188,23 @@ scan-ubuntu18.04-arm64:
- image-ubuntu18.04 - image-ubuntu18.04
- scan-ubuntu18.04-amd64 - 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: scan-ubi8-amd64:
extends: extends:
- .scan - .scan
@ -226,6 +248,13 @@ release:staging-ubuntu18.04:
needs: needs:
- image-ubuntu18.04 - image-ubuntu18.04
release:staging-ubuntu20.04:
extends:
- .release:staging
- .dist-ubuntu20.04
needs:
- image-ubuntu20.04
# Define the external release targets # Define the external release targets
# Release to NGC # Release to NGC
release:ngc-centos7: release:ngc-centos7:
@ -238,11 +267,16 @@ release:ngc-centos8:
- .release:ngc - .release:ngc
- .dist-centos8 - .dist-centos8
release:ngc-ubuntu18: release:ngc-ubuntu18.04:
extends: extends:
- .release:ngc - .release:ngc
- .dist-ubuntu18.04 - .dist-ubuntu18.04
release:ngc-ubuntu20.04:
extends:
- .release:ngc
- .dist-ubuntu20.04
release:ngc-ubi8: release:ngc-ubi8:
extends: extends:
- .release:ngc - .release:ngc
@ -259,11 +293,16 @@ release:dockerhub-centos8:
- .release:dockerhub - .release:dockerhub
- .dist-centos8 - .dist-centos8
release:dockerhub-ubuntu18: release:dockerhub-ubuntu18.04:
extends: extends:
- .release:dockerhub - .release:dockerhub
- .dist-ubuntu18.04 - .dist-ubuntu18.04
release:dockerhub-ubuntu20.04:
extends:
- .release:dockerhub
- .dist-ubuntu20.04
release:dockerhub-ubi8: release:dockerhub-ubi8:
extends: extends:
- .release:dockerhub - .release:dockerhub