Use single image type

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

.common-ci.yml

@@ -78,13 +78,6 @@ trigger-pipeline:
 .dist-ubi9:
   variables:
     DIST: "ubi9"
-  rules:
-    - when: manual
-      allow_failure: false
-
-.dist-ubuntu20.04:
-  variables:
-    DIST: "ubuntu20.04"
 
 # Define the platform targets
 .platform-amd64:
@@ -133,23 +126,6 @@ trigger-pipeline:
     - .scan-base
 
 # Define the scan targets
-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-ubi9-amd64:
   extends:
     - .scan
@@ -243,10 +219,3 @@ release:staging-ubi9:
     - .dist-ubi9
   needs:
     - image-ubi9
-
-release:staging-ubuntu20.04:
-  extends:
-    - .release:staging
-    - .dist-ubuntu20.04
-  needs:
-    - image-ubuntu20.04

.github/workflows/image.yaml

@@ -25,9 +25,6 @@ on:
 jobs:
   build:
     runs-on: linux-amd64-cpu4
-    strategy:
-      matrix:
-        dist: [ubuntu20.04, ubi9]
     steps:
       - uses: actions/checkout@v4
         name: Check out code
@@ -66,4 +63,4 @@ jobs:
           VERSION: ${COMMIT_SHORT_SHA}
         run: |
           echo "${VERSION}"
-          make -f deployments/container/Makefile build-${{ matrix.dist }}
+          make -f deployments/container/Makefile build

.gitlab-ci.yml

@@ -76,8 +76,3 @@ image-ubi9:
   extends:
     - .image-build
     - .dist-ubi9
-
-image-ubuntu20.04:
-  extends:
-    - .image-build
-    - .dist-ubuntu20.04

.nvidia-ci.yml

@@ -70,11 +70,6 @@ image-ubi9:
     - .image-pull
     - .dist-ubi9
 
-image-ubuntu20.04:
-  extends:
-    - .image-pull
-    - .dist-ubuntu20.04
-
 # We skip the integration tests for the internal CI:
 .integration:
   stage: test
@@ -118,11 +113,6 @@ image-ubuntu20.04:
 
 # Define the external release targets
 # Release to NGC
-release:ngc-ubuntu20.04:
-  extends:
-    - .release:ngc
-    - .dist-ubuntu20.04
-
 release:ngc-ubi9:
   extends:
     - .release:ngc

deployments/container/Dockerfile.ubuntu renamed to deployments/container/Dockerfile

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 ARG GOLANG_VERSION=1.23.1
+# We use an ubuntu20.04 base image to allow for a more efficient multi-arch build.
 FROM --platform=${BUILDOS}/amd64 nvcr.io/nvidia/cuda:12.3.2-base-ubuntu20.04 AS build
 
 RUN apt-get update && \
@@ -42,7 +43,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
     fi && \
     make CC=${cc} GOARCH=${TARGETARCH} PREFIX=/artifacts cmds
 
-FROM nvcr.io/nvidia/cuda:12.3.2-base-ubuntu20.04
+FROM nvcr.io/nvidia/cuda:12.3.2-base-ubi9
 
 ENV NVIDIA_DISABLE_REQUIRE="true"
 ENV NVIDIA_VISIBLE_DEVICES=all

deployments/container/Dockerfile.ubi9

@@ -38,8 +38,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DEFAULT_PUSH_TARGET := ubuntu20.04
-DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET) ubi9
+DEFAULT_PUSH_TARGET := ubi9
+DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET)
 
 IMAGE_TARGETS := $(patsubst %,image-%,$(DISTRIBUTIONS))
 BUILD_TARGETS := $(patsubst %,build-%,$(DISTRIBUTIONS))
@@ -69,7 +69,7 @@ push-%: DIST = $(*)
 push-short: DIST = $(DEFAULT_PUSH_TARGET)
 
 build-%: DIST = $(*)
-build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)
+build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile
 
 # Use a generic build target to build the relevant images
 $(IMAGE_TARGETS): image-%:
@@ -86,10 +86,6 @@ $(IMAGE_TARGETS): image-%:
 		-f $(DOCKERFILE) \
 		$(CURDIR)
 
-build-ubuntu%: DOCKERFILE_SUFFIX := ubuntu
-
-build-ubi9: DOCKERFILE_SUFFIX := ubi9
-
 # Handle the default build target.
 .PHONY: build
 build: $(DEFAULT_PUSH_TARGET)