zombie builder custom tag

qdrvm · Nov 10, 2024 · c8fe8e6 · c8fe8e6
1 parent 29c8257
commit c8fe8e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/kagome-builder-deb.yaml b/.github/workflows/kagome-builder-deb.yaml
@@ -17,12 +17,12 @@ on:
         default: 'false'
         type: 'boolean'
       runtime_cache_rebuild:
-        description: 'Rebuild Kagome Runtime Cache'
+        description: 'Rebuild Kagome Runtime cache'
         required: false
         default: 'false'
         type: 'boolean'
       builder_latest_tag:
-        description: 'Custom builder latest tag'
+        description: 'Custom Kagome Builder tag'
         default: 'latest'
         required: false
         type: 'string'

diff --git a/.github/workflows/zombie-builder.yml b/.github/workflows/zombie-builder.yml
@@ -30,6 +30,11 @@ on:
         description: 'Custom Polkadot SDK tag'
         required: false
         type: 'string'
+      builder_latest_tag:
+        description: 'Custom Polkadot Builder tag'
+        default: 'latest'
+        required: false
+        type: 'string'
 
 env:
   DOCKER_REGISTRY_PATH: ${{ secrets.GCP_REGISTRY }}/${{ secrets.GCP_PROJECT }}/kagome-dev/
@@ -38,6 +43,7 @@ env:
   CACHE_VERSION: v001
   CACHE_PATHS: ./zombienet/docker/cargo
   POLKADOT_SDK_TAG: ${{ github.event.inputs.polkadot_sdk_tag }}
+  BUILDER_LATEST_TAG: ${{ github.event.inputs.builder_latest_tag }}
 
 jobs:
   build_polkadot_builder:
@@ -79,6 +85,7 @@ jobs:
         if: env.exists == 'false' || github.event.inputs.polkadot_image_rebuild == 'true'
         run: make polkadot_builder \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH}
+          BUILDER_LATEST_TAG=${BUILDER_LATEST_TAG}
 
       - name: "Push Polkadot Builder"
         working-directory: ./zombienet/docker

diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile
@@ -15,6 +15,8 @@ POLKADOT_SDK_TAG ?=
 RUST_IMAGE=rust
 RUST_IMAGE_TAG=1.81-slim-bookworm
 SCCACHE_VERSION ?= 0.7.4
+BUILDER_LATEST_TAG ?= latest
+TESTER_LATEST_TAG ?= latest
 
 # polkadot_binary Variables
 SCCACHE_GCS_BUCKET ?=
@@ -106,7 +108,7 @@ polkadot_builder:
 		POLKADOT_SDK_RELEASE=$$(grep 'polkadot_format_version:' polkadot-sdk-versions.txt | cut -d ' ' -f 2); \
 		docker build --platform $(PLATFORM) \
 		-t $(DOCKER_REGISTRY_PATH)polkadot_builder:$$POLKADOT_SDK_RELEASE \
-		-t $(DOCKER_REGISTRY_PATH)polkadot_builder:latest \
+		-t $(DOCKER_REGISTRY_PATH)polkadot_builder:$(BUILDER_LATEST_TAG) \
 		-f polkadot_builder.Dockerfile \
 		--build-arg RUST_IMAGE=$(RUST_IMAGE) \
 		--build-arg RUST_IMAGE_TAG=$(RUST_IMAGE_TAG) \
@@ -120,7 +122,7 @@ polkadot_builder_push:
 	if [ -f polkadot-sdk-versions.txt ]; then \
   		POLKADOT_SDK_RELEASE=$$(grep 'polkadot_format_version:' polkadot-sdk-versions.txt | cut -d ' ' -f 2); \
 		docker push $(DOCKER_REGISTRY_PATH)polkadot_builder:$$POLKADOT_SDK_RELEASE ; \
-		docker push $(DOCKER_REGISTRY_PATH)polkadot_builder:latest ; \
+		docker push $(DOCKER_REGISTRY_PATH)polkadot_builder:$(BUILDER_LATEST_TAG) ; \
 	else \
 		echo "One or more files are missing."; \
 	fi
@@ -191,7 +193,7 @@ zombie_tester:
 		docker build \
 			--platform $(PLATFORM) \
 			--no-cache \
-			-t $(DOCKER_REGISTRY_PATH)zombie_tester:latest \
+			-t $(DOCKER_REGISTRY_PATH)zombie_tester:$(TESTER_LATEST_TAG) \
 			-t $(DOCKER_REGISTRY_PATH)zombie_tester:$${POLKADOT_SDK_RELEASE}_$${ZOMBIENET_RELEASE} \
 			--secret id=google_creds,src=$(GOOGLE_APPLICATION_CREDENTIALS) \
 			-f zombie_tester.Dockerfile \
@@ -209,7 +211,7 @@ zombie_tester_push:
 		ZOMBIENET_RELEASE=$$(grep 'short_version:' zombienet-versions.txt | cut -d ' ' -f 2); \
 		POLKADOT_SDK_RELEASE=$$(grep 'polkadot_format_version:' polkadot-sdk-versions.txt | cut -d ' ' -f 2); \
 		docker push $(DOCKER_REGISTRY_PATH)zombie_tester:$${POLKADOT_SDK_RELEASE}_$${ZOMBIENET_RELEASE} ; \
-		docker push $(DOCKER_REGISTRY_PATH)zombie_tester:latest ; \
+		docker push $(DOCKER_REGISTRY_PATH)zombie_tester:$(TESTER_LATEST_TAG) ; \
 	else \
 		echo "One or more files are missing."; \
 	fi