bump other pieces after rebase

canonical · Aug 2, 2024 · a01f5f4 · a01f5f4
1 parent 5cf5af8
commit a01f5f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ $(shell mkdir -p $(_MAKE_DIR))
 # eg, charmed-spark
 ROCK_NAME := $(shell cat images/charmed-spark/rockcraft.yaml | yq .name)
 
-# eg, 3.4.2
+# eg, 3.5.1
 SPARK_VERSION := $(shell cat images/charmed-spark/rockcraft.yaml | yq .version)
 
 # eg, 1.9.0
@@ -56,27 +56,27 @@ JUPYTER_VERSION=$(shell cat images/metadata.yaml | yq .flavours.jupyter.version)
 ROCK_NAME_GPU := $(shell cat images/charmed-spark-gpu/rockcraft.yaml | yq .name)
 
 # The filename of the Rock file built during the build process.
-# eg, charmed-spark_3.4.2_amd64.rock
+# eg, charmed-spark_3.5.1_amd64.rock
 ROCK_FILE=$(ROCK_NAME)_$(SPARK_VERSION)_$(PLATFORM).rock
 
 # The filename of the final artifact built for Spark image
-# eg, charmed-spark_3.4.2_amd64.tar
+# eg, charmed-spark_3.5.1_amd64.tar
 SPARK_ARTIFACT=$(ROCK_NAME)_$(SPARK_VERSION)_$(PLATFORM).tar
 
 # The filename of the final artifact built for Jupyter image
-# eg, charmed-spark-jupyterlab_3.4.2_amd64.tar
+# eg, charmed-spark-jupyterlab_3.5.1_amd64.tar
 JUPYTER_ARTIFACT=$(ROCK_NAME)-jupyterlab_$(SPARK_VERSION)_$(PLATFORM).tar
 
 # The filename of the final artifact built for Kyuubi image
-# eg, charmed-spark-kyuubi_3.4.2_amd64.tar
+# eg, charmed-spark-kyuubi_3.5.1_amd64.tar
 KYUUBI_ARTIFACT=$(ROCK_NAME)-kyuubi_$(SPARK_VERSION)_$(PLATFORM).tar
 
 # The filename of the Rock file built during the build process.
-# eg, charmed-spark_gpu_3.4.2_amd64.rock
+# eg, charmed-spark_gpu_3.5.1_amd64.rock
 ROCK_FILE_GPU=$(ROCK_NAME_GPU)_$(SPARK_VERSION)_$(PLATFORM).rock
 
 # The filename of the final artifact built for Spark GPU image
-# eg, charmed-spark-gpu_3.4.2_amd64.tar
+# eg, charmed-spark-gpu_3.5.1_amd64.tar
 SPARK_GPU_ARTIFACT=$(ROCK_NAME_GPU)_$(SPARK_VERSION)_$(PLATFORM).tar
 
 
@@ -87,13 +87,13 @@ SPARK_GPU_ARTIFACT=$(ROCK_NAME_GPU)_$(SPARK_VERSION)_$(PLATFORM).tar
 # TAG: The tag for the image
 #
 # For eg,
-# ARTIFACT = "charmed-spark_3.4.2_amd64.tar" 			TAG = "3.4.2"			DISPLAY_NAME = "ghcr.io/canonical/charmed-spark"
+# ARTIFACT = "charmed-spark_3.5.1_amd64.tar" 			TAG = "3.5.1"			DISPLAY_NAME = "ghcr.io/canonical/charmed-spark"
 # or,
-# ARTIFACT = "charmed-spark-jupyterlab_3.4.2_amd64.tar"	TAG = "3.4.2-4.0.11"	DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-jupyterlab"
+# ARTIFACT = "charmed-spark-jupyterlab_3.5.1_amd64.tar"	TAG = "3.5.1-4.0.11"	DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-jupyterlab"
 # or,
-# ARTIFACT = "charmed-spark-kyuubi_3.4.2_amd64.tar"		TAG = "3.4.2-1.9.0"		DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-kyuubi"
+# ARTIFACT = "charmed-spark-kyuubi_3.5.1_amd64.tar"		TAG = "3.5.1-1.9.0"		DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-kyuubi"
 # or, 
-# ARTIFACT = "charmed-spark_gpu_3.4.2_amd64.tar" 			TAG = "3.4.2"			DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-gpu"
+# ARTIFACT = "charmed-spark_gpu_3.5.1_amd64.tar" 			TAG = "3.5.1"			DISPLAY_NAME = "ghcr.io/canonical/charmed-spark-gpu"
 
 ifeq ($(FLAVOUR), jupyter)
 	DISPLAY_NAME=$(REPOSITORY)$(PREFIX)$(ROCK_NAME)-jupyterlab
@@ -174,7 +174,7 @@ help:
 
 # Recipe for creating a rock image from the current repository.
 # 
-# ROCK_FILE => charmed-spark_3.4.2_amd64.rock 
+# ROCK_FILE => charmed-spark_3.5.1_amd64.rock 
 #
 $(ROCK_FILE): images/charmed-spark/rockcraft.yaml $(wildcard images/charmed-spark/*/*)
 	@echo "=== Building Charmed Image ==="
@@ -275,7 +275,7 @@ endif
 
 # Shorthand recipe to build the image. The flavour is picked from FLAVOUR variable to `make`.
 #
-# eg, ARTIFACT => charmed-spark_3.4.2_amd64.tar
+# eg, ARTIFACT => charmed-spark_3.5.1_amd64.tar
 build: $(ARTIFACT)
 
 

diff --git a/images/charmed-spark-gpu/rockcraft.yaml b/images/charmed-spark-gpu/rockcraft.yaml
@@ -11,7 +11,7 @@ description: |
 
 license: Apache-2.0
 
-version: "3.4.2"
+version: "3.5.1"
 
 base: [email protected]
 
@@ -52,8 +52,8 @@ services:
 parts:
   spark:
     plugin: dump
-    source: https://github.com/canonical/central-uploader/releases/download/spark-3.4.2-ubuntu5/spark-3.4.2-ubuntu5-20240702211805-bin-k8s.tgz
-    source-checksum: sha512/2d620730b31ddb6532dc0f08c3da92aa4fbc0e3d7eea7628bc9705ae26b3a38db5b776be27e65271d7c375cfc676def233c8de37917c6cb6becd9cbbe6fabb22
+    source: https://github.com/canonical/central-uploader/releases/download/spark-3.5.1-ubuntu1/spark-3.5.1-ubuntu1-20240801193221-bin-k8s.tgz
+    source-checksum: sha512/4c9ec4dc3f67602ec9f83fa08486985647b8ab7eaf3748c3042a382ed367fc776b7623a067ceef408337cf5c2171a010da0ff063dcbf76c4b84674b661d2330b
     overlay-script: |
       sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list
       apt-get update