Tag git commit sha with bundle image

Signed-off-by: Shiva Kumar (SW-CLOUD) <[email protected]>

Author: Shiva Kumar

.github/workflows/ci.yaml

@@ -17,9 +17,8 @@ name: CI
 on:
   push:
     branches:
-      - "pull-request/[0-9]+"
-      - main
-      - release-*
+     - bundlecommitsha
+     
 
 concurrency:
   group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number || github.ref }}
@@ -400,7 +399,7 @@ jobs:
           retention-days: 15
 
   release-latest-gpu-operator-image:
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Runs only if the event is a push to the main branch
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/bundlecommitsha' }} # Runs only if the event is a push to the main branch
     needs: [e2e-tests-containerd, e2e-tests-nvidiadriver]
     runs-on: linux-amd64-cpu4
     steps:
@@ -423,10 +422,10 @@ jobs:
       - name: Retag gpu-operator
         run: |
           regctl registry login ghcr.io -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-          regctl image copy ${OPERATOR_IMAGE}:${OPERATOR_VERSION} ${OPERATOR_IMAGE}:main-latest
+          # regctl image copy ${OPERATOR_IMAGE}:${OPERATOR_VERSION} ${OPERATOR_IMAGE}:main-latest
 
   push-gpu-operator-bundle-image:
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Runs only if the event is a push to the main branch
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/bundlecommitsha' }} # Runs only if the event is a push to the main branch
     needs: [release-latest-gpu-operator-image]
     runs-on: linux-amd64-cpu4
     steps:
@@ -441,6 +440,7 @@ jobs:
       - name: Build bundle-image
         env:
           BUNDLE_IMAGE: "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:${{ github.ref_name }}-latest"
+          BUNDLE_IMAGE_TAG: "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:${GITHUB_SHA:0:8}"
           VERSION: ""
           DEFAULT_CHANNEL: "stable"
           CHANNELS: "stable"

Makefile

@@ -60,6 +60,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # BUNDLE_IMAGE defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMAGE=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMAGE ?= gpu-operator-bundle:$(VERSION)
+BUNDLE_IMAGE_TAG ?= gpu-operator-bundle:$(VERSION)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -131,11 +132,12 @@ build-bundle-image:
 	$(DOCKER) build \
 	--build-arg DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) \
 	--build-arg GIT_COMMIT=$(GIT_COMMIT) \
-	-f docker/bundle.Dockerfile -t $(BUNDLE_IMAGE) .
+	-f docker/bundle.Dockerfile -t $(BUNDLE_IMAGE) -t $(BUNDLE_IMAGE_TAG) .
 
 # Push the bundle image.
 push-bundle-image: build-bundle-image
 	$(DOCKER) push $(BUNDLE_IMAGE)
+	$(DOCKER) push $(BUNDLE_IMAGE_TAG)
 
 # Define local and dockerized golang targets