Ci/build steps version info (#2206)

* commit version fix, print versions when zombie test starting * kagome builder version info * versions for main ci pipeline * ci builder versions --------- Co-authored-by: Kirill Azovtsev <[email protected]>
qdrvm · Sep 6, 2024 · eff8d6c · eff8d6c
1 parent 2b530f8
commit eff8d6c
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 9 deletions.
diff --git a/.github/workflows/kagome-builder-deb.yaml b/.github/workflows/kagome-builder-deb.yaml
@@ -54,7 +54,7 @@ jobs:
           KAGOME_BUILDER_DEB_IMAGE=${DOCKER_REGISTRY_PATH}kagome_builder_deb:${IMAGE_TAG}
           TAG_EXISTS=$(docker manifest inspect ${KAGOME_BUILDER_DEB_IMAGE} > /dev/null 2>&1 && echo "true" || echo "false")
           echo "exists=$TAG_EXISTS" >> $GITHUB_ENV
-          echo "kagome_builder_deb=KAGOME_BUILDER_DEB_IMAGE" >> GITHUB_OUTPUT
+          echo "kagome_builder_deb=$KAGOME_BUILDER_DEB_IMAGE" >> $GITHUB_OUTPUT
 
       - name: "Build Polkadot Builder"
         working-directory: ./housekeeping/docker/kagome-dev
@@ -67,6 +67,11 @@ jobs:
         if: env.exists == 'false' || github.event.inputs.kagome_image_rebuild == 'true'
         run: make kagome_builder_deb_push \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH}
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Docker Image Name: ${{ steps.check-tag.outputs.kagome_builder_deb }}"
 
   build_kagome_runtime:
     runs-on: [ actions-runner-controller ]
@@ -99,4 +104,9 @@ jobs:
         if: github.event.inputs.runtime_cache_rebuild == 'true'
         run: make upload_apt_package_runtime \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH}
-
+
+      - name: "Versions Info"
+        if: always()
+        working-directory: ./housekeeping/docker/kagome-dev
+        run: |
+          echo "Package name and version: kagome-dev-runtime $(python3 get_wasmedge_version.py)-$(date +'%y.%m.%d')"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -388,6 +388,14 @@ jobs:
         with:
           path: ${{ env.CACHE_PATH }}
           key: ${{ steps.cache-restore.outputs.cache-primary-key }}
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Kagome Package Version: kagome-dev ${{ env.package_version }}"
+          echo "Kagome Images: "
+          cat /tmp/docker_image.env || true
+          cat /tmp/dockerhub_image.env || true
 
 
   Zombie-Tests:
@@ -491,6 +499,14 @@ jobs:
           name: logs-${{ matrix.options.test }}
           path: /tmp/test_logs
 
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Kagome Package Version: kagome-dev ${{ env.package_version }}"
+          echo "Zombie Tester Image: ${{ env.zombie_tester_image }}"
+          echo "Zombie Tests Versions: "
+          cat /tmp/versions.env || true
+
       - name: "Show system info"
         if: always()
         run: |

diff --git a/.github/workflows/zombie-builder.yml b/.github/workflows/zombie-builder.yml
@@ -80,6 +80,11 @@ jobs:
         if: env.exists == 'false' || github.event.inputs.polkadot_image_rebuild == 'true'
         run: make polkadot_builder_push \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH}
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Polkadot Builder Image: ${{ steps.check-tag.outputs.polkadot_builder_image }}"
   
 
   building_binaries:
@@ -218,4 +223,8 @@ jobs:
         if: env.exists == 'false' || github.event.inputs.zombie_tester_image_rebuild == 'true'
         run: make zombie_tester_push \
           DOCKER_REGISTRY_PATH=${DOCKER_REGISTRY_PATH} \
-
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Zombie Tester Image: ${{ steps.check-tag.outputs.zombie_tester_image }}"
diff --git a/.github/workflows/zombie-tests.yaml b/.github/workflows/zombie-tests.yaml
@@ -59,7 +59,7 @@ jobs:
           gcloud auth configure-docker --quiet
           gcloud auth configure-docker ${{ secrets.GCP_REGISTRY }} --quiet
 
-      - name: "Get Polkadot and Zombienet versions"
+      - name: "Get commit version"
         working-directory: ./housekeeping/docker/kagome-dev
         run: make get_versions
 
@@ -132,6 +132,14 @@ jobs:
         with:
           path: ${{ env.CACHE_PATH }}
           key: ${{ steps.cache-restore.outputs.cache-primary-key }}
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Kagome Package Version: kagome-dev ${{ env.package_version }}"
+          echo "Kagome Images: "
+          cat /tmp/docker_image.env || true
+          cat /tmp/dockerhub_image.env || true
 
 
   Zombie-Tests:
@@ -195,7 +203,7 @@ jobs:
           gcloud auth configure-docker --quiet
           gcloud auth configure-docker ${{ secrets.GCP_REGISTRY }} --quiet
         
-      - name: "Get Polkadot and Zombienet versions"
+      - name: "Get commit version"
         working-directory: ./housekeeping/docker/kagome-dev
         run: make get_versions
 
@@ -230,7 +238,15 @@ jobs:
         with:
           name: logs-${{ matrix.options.test }}
           path: /tmp/test_logs
-
+
+      - name: "Versions Info"
+        if: always()
+        run: |
+          echo "Kagome Package Version: kagome-dev ${{ env.package_version }}"
+          echo "Zombie Tester Image: ${{ env.zombie_tester_image }}"
+          echo "Zombie Tests Versions: "
+          cat /tmp/versions.env || true
+
       - name: "Show system info"
         if: always()
         run: |

diff --git a/housekeeping/docker/kagome-dev/Makefile b/housekeeping/docker/kagome-dev/Makefile
@@ -48,8 +48,8 @@ export BUILDKIT_PROGRESS=auto
 
 
 get_versions:
-	echo "full_commit_hash: `git rev-parse HEAD`" > commit_hash.txt
-	echo "short_commit_hash: `git rev-parse HEAD | head -c 7`" >> commit_hash.txt
+	@echo "full_commit_hash: `git rev-parse HEAD`" | tee commit_hash.txt
+	@echo "short_commit_hash: `git rev-parse HEAD | head -c 7`" | tee -a commit_hash.txt
 
 kagome_builder_deb:
 	docker build --platform $(PLATFORM) \
@@ -250,17 +250,21 @@ kagome_image_push:
 	BUILD_TYPE_LOWER=$$(echo $(BUILD_TYPE) | tr '[:upper:]' '[:lower:]'); \
 	SHORT_COMMIT_HASH=$$(grep 'short_commit_hash:' commit_hash.txt | cut -d ' ' -f 2); \
 	docker push $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} ; \
+	echo "KAGOME_IMAGE=$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH}" | tee /tmp/docker_image.env ; \
 	docker push $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:latest ; \
+	echo "KAGOME_IMAGE_LATEST=$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:latest" | tee -a /tmp/docker_image.env ; \
 	if [ "$(IS_MAIN_OR_TAG)" = "true" ]; then \
 		if [ "$(GIT_REF_NAME)" = "master" ]; then \
 			MAIN_TAG="$${SHORT_COMMIT_HASH}-master"; \
 			docker tag $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} \
 			$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${MAIN_TAG}; \
 			docker push $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${MAIN_TAG}; \
+			echo "KAGOME_IMAGE_MASTER=$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${MAIN_TAG}" | tee -a /tmp/docker_image.env ; \
 		elif [ -n "$(GIT_REF_NAME)" ]; then \
 			docker tag $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} \
 			$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${GIT_REF_NAME}; \
 			docker push $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${GIT_REF_NAME}; \
+			echo "KAGOME_IMAGE_TAG=$(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${GIT_REF_NAME}" | tee -a /tmp/docker_image.env ; \
 		fi \
 	fi
 
@@ -275,14 +279,18 @@ kagome_image_push_dockerhub:
 			docker tag $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} \
 			$(DOCKERHUB_REGISTRY_PATH):master; \
 			docker push $(DOCKERHUB_REGISTRY_PATH):$${MAIN_TAG}; \
+			echo "KAGOME_DOCKERHUB_IMAGE_MASTER=$(DOCKERHUB_REGISTRY_PATH):$${MAIN_TAG}" | tee /tmp/dockerhub_image.env ; \
 			docker push $(DOCKERHUB_REGISTRY_PATH):master; \
+			echo "KAGOME_DOCKERHUB_IMAGE_LATEST=$(DOCKERHUB_REGISTRY_PATH):master" | tee -a /tmp/dockerhub_image.env ; \
 		elif [ -n "$(GIT_REF_NAME)" ]; then \
 			docker tag $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} \
 			$(DOCKERHUB_REGISTRY_PATH):$${GIT_REF_NAME}; \
 			docker tag $(DOCKER_REGISTRY_PATH)kagome_$${BUILD_TYPE_LOWER}:$${SHORT_COMMIT_HASH} \
 			$(DOCKERHUB_REGISTRY_PATH):latest; \
 			docker push $(DOCKERHUB_REGISTRY_PATH):$${GIT_REF_NAME}; \
+			echo "KAGOME_DOCKERHUB_IMAGE_TAG=$(DOCKERHUB_REGISTRY_PATH):$${GIT_REF_NAME}" | tee /tmp/dockerhub_image.env ; \
 			docker push $(DOCKERHUB_REGISTRY_PATH):latest; \
+			echo "KAGOME_DOCKERHUB_IMAGE_LATEST=$(DOCKERHUB_REGISTRY_PATH):latest" | tee -a /tmp/dockerhub_image.env ; \
 		fi \
 	fi
 
diff --git a/zombienet/docker/Makefile b/zombienet/docker/Makefile
@@ -49,8 +49,8 @@ export BUILDKIT_PROGRESS=auto
 # (2) test file path
 define run_test
 	@CONTAINER_NAME=$$(openssl rand -hex 6); \
-	START_TIME=$$(date +%s); \
 	echo "Running test in container $$CONTAINER_NAME with params \n image:$(1), test:$(2) and \n Kagome package version: $(KAGOME_PACKAGE_VERSION)"; \
+	START_TIME=$$(date +%s); \
 	TEST_PATH=$$(echo $(2) | xargs); \
 	docker run --name $$CONTAINER_NAME \
 		--platform $(PLATFORM) \
@@ -63,6 +63,11 @@ define run_test
 		$(1) \
 		-c "sed -i '1s/^#//' /etc/apt/sources.list.d/kagome.list && \
 			install_packages kagome-dev=$(KAGOME_PACKAGE_VERSION) kagome-dev-runtime && \
+			echo \"KAGOME_DEV_VERSION=\$$(apt-cache policy kagome-dev | grep 'Installed:' | awk '{print \$$2}')\" > /tmp/versions.env && \
+			echo \"KAGOME_DEV_RUNTIME_VERSION=\$$(apt-cache policy kagome-dev-runtime | grep 'Installed:' | awk '{print \$$2}')\" >> /tmp/versions.env && \
+			echo \"POLKADOT_VERSION=\$$(polkadot --version | awk '{print \$$2}')\" >> /tmp/versions.env && \
+			echo \"ZOMBIENET_VERSION=\$$(zombienet version)\" >> /tmp/versions.env && \
+			cat /tmp/versions.env && \
 			zombienet-linux-x64 test -p native /home/nonroot/bin/$$TEST_PATH " ; \
 	TEST_EXIT_CODE=$$(docker inspect $$CONTAINER_NAME --format='{{.State.ExitCode}}'); \
 	if [ "$(COPY_LOGS_TO_HOST)" = "true" ]; then \
@@ -214,6 +219,7 @@ copy_logs_to_host:
 	for DIR in $$DIRS_TO_COPY; do \
 		docker cp "$$FINISHED_CONTAINER_NAME:$$DIR/logs" "$(HOST_LOGS_PATH)/$$(basename $$DIR)"; \
 	done; \
+	docker cp "$$FINISHED_CONTAINER_NAME:/tmp/versions.env" "/tmp/versions.env" ; \
 	echo "Logs copied to $(HOST_LOGS_PATH)"; \
 	echo "Runtime cache directory content:"; \
 	docker exec $$FINISHED_CONTAINER_NAME "/bin/bash" -c "ls -la /tmp/kagome/runtimes-cache/" ; \