Merge branch 'fix-release-ci' into 'master'

Remove push-latest target

See merge request nvidia/cloud-native/mig-parted!33

Author: Evan Lezar

.common-ci.yml

@@ -66,13 +66,12 @@ default:
 
     - 'echo "Deploying ${IN_IMAGE}:${IN_VERSION}-${DIST} as ${OUT_IMAGE}:${OUT_VERSION}-${DIST}"'
 
-    # Tag the output image (note the leading v is stripped from the VERSION)
+    # Tag the output image
     - docker tag "${IN_IMAGE}:${IN_VERSION}-${DIST}" "${OUT_IMAGE}:${OUT_VERSION}-${DIST}"
 
     - '[[ -z "${OUT_REGISTRY}" ]] || docker login -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}" "${OUT_REGISTRY}"'
 
     # Invoke the make target. This includes logic for pushing short / latest versions
-    # Note: The leading v is stripped from the version
     - '[[ -n "${USE_DOCKER_PUSH}" ]] || make IMAGE="${OUT_IMAGE}" VERSION="${OUT_VERSION}" push-${DIST}'
     - '[[ -z "${USE_DOCKER_PUSH}" ]] || docker push "${OUT_IMAGE}:${OUT_VERSION}-${DIST}"'
 

.nvidia-ci.yml

@@ -63,21 +63,21 @@ variables:
     - docker pull ${IN_IMAGE}:${IN_VERSION}-${DIST}
 
 # .mig-manager-ci-input-image sets the IN_* variables to those of the public CI registry
-.mig-manager-public-ci-input-image:
+.mig-manager-source-ci-input-image:
   variables:
     IN_IMAGE: "${SOURCE_REGISTRY}/${SOURCE_IMAGE}"
     IN_VERSION: "${CI_COMMIT_SHA}"
 
-# .pull-mig-manager pulls the sha-tagged image from the public CI to the
+# .pull-source-mig-manager pulls the sha-tagged image from the public CI to the
 # internal CI registry. This allow follow-on stages to work as if the image was
 # built in the internal CI.
-.pull-mig-manager:
+.pull-source-mig-manager:
   stage: pull
   variables:
     USE_DOCKER_PUSH: "yes"
   extends:
     - .pull-source-image
-    - .mig-manager-public-ci-input-image
+    - .mig-manager-source-ci-input-image
     - .push-mig-manager
     - .mig-manager-ci-output-image
 
@@ -121,7 +121,7 @@ variables:
   script:
     - 'echo Dist: ${DIST} ; [[ -n "${DIST}" ]] || exit 1'
 
-    # Tag the output image (note the leading v is stripped from the VERSION)
+    # Tag the output image
     - docker tag "${IN_IMAGE}:${IN_VERSION}-${DIST}" "${OUT_IMAGE}:${OUT_VERSION}-${DIST}"
 
     - apk add --no-cache git
@@ -141,7 +141,7 @@ scan-ubi8:
 
 pull-ubi8:
   extends:
-    - .pull-mig-manager
+    - .pull-source-mig-manager
     - .dist-ubi8
 
 release-ngc-ubi8:
@@ -161,7 +161,7 @@ scan-ubuntu20:
 
 pull-ubuntu20:
   extends:
-    - .pull-mig-manager
+    - .pull-source-mig-manager
     - .dist-ubuntu20
 
 release-ngc-ubuntu20:

deployments/gpu-operator/Makefile

@@ -38,15 +38,11 @@ $(PUSH_TARGETS): push-%:
 	$(DOCKER) push "$(IMAGE):$(VERSION)-$(*)"
 
 # For the default push target we also push the short and latest tags
-push-$(DEFAULT_PUSH_TARGET): push-short push-latest
+push-$(DEFAULT_PUSH_TARGET): push-short
 push-short:
 	$(DOCKER) tag "$(IMAGE):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(IMAGE):$(VERSION)"
 	$(DOCKER) push "$(IMAGE):$(VERSION)"
 
-push-latest:
-	$(DOCKER) tag "$(IMAGE):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(IMAGE):latest"
-	$(DOCKER) push "$(IMAGE):latest"
-
 
 $(TARGETS): %: build-%
 $(BUILD_TARGETS): build-%: