Changes to release workflow (hyperledger#7711)

* Changes to release workflow - Workflow environment variable changed to RELEASE_VERSION instead of RELEASE_NAME to make it more meaningful - Workflows draft-release and docker-promote previously trigger workflow container-verify. This can result in trigger is successful but actual verification workflow fails. This will not be reflected in the draft-release and docker-promote workflows. Container verify code is embedded in the draft-release and docker-promote workflows to avoid this confusion Signed-off-by: Chaminda Divitotawela <[email protected]> * PR comment improvements Signed-off-by: Chaminda Divitotawela <[email protected]> * Match the only tags starting with word latest for latest check Signed-off-by: Chaminda Divitotawela <[email protected]> --------- Signed-off-by: Chaminda Divitotawela <[email protected]> Co-authored-by: Simon Dudley <[email protected]>
Consensys · Oct 3, 2024 · 8cf20ed · 8cf20ed
1 parent f4dc48d
commit 8cf20ed
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 87 deletions.
diff --git a/.github/workflows/BesuContainerVerify.sh b/.github/workflows/BesuContainerVerify.sh
@@ -57,7 +57,7 @@ else
 fi
 
 # For the latest tag check the version match
-if [[ ${TAG} == "latest" && ${CHECK_LATEST} == "true" ]]
+if [[ ${TAG} =~ ^latest && ${CHECK_LATEST} == "true" ]]
 then
   _VERSION_IN_LOG=$(docker logs ${CONTAINER_NAME} | grep "#" | grep "Besu version" | cut -d " " -f 4 | sed 's/\s//g')
   echo "Extracted version from logs [$_VERSION_IN_LOG]"

diff --git a/.github/workflows/docker-promote.yml b/.github/workflows/docker-promote.yml
@@ -14,25 +14,25 @@ jobs:
   validate:
     runs-on: ubuntu-22.04
     env:
-      RELEASE_NAME: "${{ github.event.release.name }}"
+      RELEASE_VERSION: "${{ github.event.release.name }}"
     steps:
       - name: Pre-process Release Name
-        id: pre_process_release_name
+        id: pre_process_release_version
         run: |       
           # strip all whitespace
-          RELEASE_NAME="${RELEASE_NAME//[[:space:]]/}"
-          if [[ ! "$RELEASE_NAME" =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?(-.*)?$ ]]; then
+          RELEASE_VERSION="${RELEASE_VERSION//[[:space:]]/}"
+          if [[ ! "$RELEASE_VERSION" =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?(-.*)?$ ]]; then
             echo "Release name does not conform to a valid besu release format YY.M.v[-suffix], e.g. 24.8.0-RC1."
             exit 1
           fi
-          echo "release_name=$RELEASE_NAME" >> $GITHUB_OUTPUT  # Set as output using the new syntax
+          echo "release_version=$RELEASE_VERSION" >> $GITHUB_OUTPUT  # Set as output using the new syntax
     outputs:
-      release_name: ${{ steps.pre_process_release_name.outputs.release_name }}
+      release_version: ${{ steps.pre_process_release_version.outputs.release_version }}
 
   docker-promote:
     needs: [validate]
     env:
-      RELEASE_NAME: ${{ needs.validate.outputs.release_name }}  # Use the output from the pre_process_release job
+      RELEASE_VERSION: ${{ needs.validate.outputs.release_version }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -58,24 +58,52 @@ jobs:
           cache-disabled: true
 
       - name: Docker upload
-        run: ./gradlew "-Prelease.releaseVersion=${{ env.RELEASE_NAME }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" dockerUploadRelease
+        run: ./gradlew "-Prelease.releaseVersion=${{ env.RELEASE_VERSION }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" dockerUploadRelease
 
       - name: Docker manifest
-        run: ./gradlew "-Prelease.releaseVersion=${{ env.RELEASE_NAME }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" manifestDockerRelease
+        run: ./gradlew "-Prelease.releaseVersion=${{ env.RELEASE_VERSION }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" manifestDockerRelease
 
   docker-verify:
-    needs: [validate, docker-promote]
+    needs: [validate,docker-promote]
     env:
-      RELEASE_NAME: ${{ needs.validate.outputs.release_name }}  # Use the output from the pre_process_release job
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      actions: write
+      CONTAINER_NAME: besu-check
+      RELEASE_VERSION: ${{ needs.validate.outputs.release_version }}
+    runs-on: ${{ matrix.combination.runner }}
+    timeout-minutes: 4
+    strategy:
+      matrix:
+        combination:
+          - tag: latest-amd64
+            platform: 'linux/amd64'
+            runner: ubuntu-22.04
+          - tag: latest
+            platform: ''
+            runner: ubuntu-22.04
+          - tag: latest-arm64
+            platform: ''
+            runner: besu-arm64
+          - tag: latest
+            platform: ''
+            runner: besu-arm64
+
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          sparse-checkout: '.github/workflows/BesuContainerVerify.sh'
 
-      - name: Trigger container verify
-        run: echo '{"version":"${{ env.RELEASE_NAME }}","verify-latest-version":"true"}' | gh workflow run container-verify.yml --json
+      - name: Start container
+        run: |
+          PLATFORM_OPT=""
+          [[ x${{ matrix.combination.platform }} != 'x' ]] && PLATFORM_OPT="--platform ${{ matrix.combination.platform }}"
+          docker run -d $PLATFORM_OPT --name ${{ env.CONTAINER_NAME }} ${{ secrets.DOCKER_ORG }}/besu:${{ matrix.combination.tag }}
+
+      - name: Verify besu container
+        run: bash .github/workflows/BesuContainerVerify.sh
         env:
-          GH_TOKEN: ${{ github.token }}
+          TAG: ${{ matrix.combination.tag }}
+          VERSION: ${{ env.RELEASE_VERSION }}
+          CHECK_LATEST: true
+
+      - name: Stop container
+        run: docker stop ${{ env.CONTAINER_NAME }}