[DPE-4993] Fix release pipeline for GPU image (#100)

canonical · Aug 2, 2024 · a9f919a · a9f919a
1 parent fcfe80b
commit a9f919a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,6 +30,8 @@ jobs:
 
       - name: Setup LXD
         uses: canonical/setup-lxd@main
+        with:
+          channel: 5.21/stable
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/build_gpu.yaml b/.github/workflows/build_gpu.yaml
@@ -28,6 +28,8 @@ jobs:
 
       - name: Setup LXD
         uses: canonical/setup-lxd@main
+        with:
+          channel: 5.21/stable
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/integration-gpu.yaml b/.github/workflows/integration-gpu.yaml
@@ -62,8 +62,9 @@ jobs:
     
     - name: Install required packages/snaps
       run: |
-        sudo snap install yq
+        sudo apt-get update
         sudo apt-get install build-essential -yqq
+        sudo snap install yq
 
     - name: Get Artifact Name
       id: artifact

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -213,6 +213,8 @@ jobs:
           TRACK=${{ needs.release_checks.outputs.track }}
           if [ ! -z "$RISK" ] && [ "${RISK}" != "no-risk" ]; then TAG=${TRACK}_${RISK}; else TAG=${TRACK}; fi
       
+          IMAGE_NAME=$(make help REPOSITORY=${REPOSITORY} TAG=${TAG} FLAVOUR=spark-gpu help | grep "Image\:" | cut -d ":" -f2  | xargs)
+
           # Import artifact into docker with new tag
           sudo make docker-import \
             FLAVOUR=spark-gpu \

diff --git a/Makefile b/Makefile
@@ -133,7 +133,7 @@ AZURE_MARKER=$(_MAKE_DIR)/azure.tag
 # The names of different flavours of the image in the docker container registry
 STAGED_IMAGE_DOCKER_ALIAS=staged-charmed-spark:latest
 SPARK_DOCKER_ALIAS=charmed-spark:$(SPARK_VERSION)
-SPARK_GPU_DOCKER_ALIAS=charmed-spark:$(SPARK_VERSION)
+SPARK_GPU_DOCKER_ALIAS=charmed-spark-gpu:$(SPARK_VERSION)
 JUPYTER_DOCKER_ALIAS=charmed-spark-jupyter:$(SPARK_VERSION)-$(JUPYTER_VERSION)
 KYUUBI_DOCKER_ALIAS=charmed-spark-kyuubi:$(SPARK_VERSION)-$(KYUUBI_VERSION)
 
@@ -192,11 +192,11 @@ $(SPARK_MARKER): $(ROCK_FILE) images/charmed-spark/Dockerfile
           oci-archive:"$(ROCK_FILE)" \
           docker-daemon:"$(STAGED_IMAGE_DOCKER_ALIAS)"
 
-	docker build -t $(SPARK_GPU_DOCKER_ALIAS) \
+	docker build -t $(SPARK_DOCKER_ALIAS) \
 		--build-arg BASE_IMAGE="$(STAGED_IMAGE_DOCKER_ALIAS)" \
 		images/charmed-spark-gpu
 
-	docker save $(SPARK_GPU_DOCKER_ALIAS) -o $(SPARK_ARTIFACT)
+	docker save $(SPARK_DOCKER_ALIAS) -o $(SPARK_ARTIFACT)
 
 	touch $(SPARK_MARKER)