Updates

Signed-off-by: Artem Kladov <artem.kladov@flant.com>
deckhouse · Jul 21, 2024 · e0e0d9e · e0e0d9e
1 parent 1d66daa
commit e0e0d9e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 175 deletions.
diff --git a/.github/ci_templates/build.yml b/.github/ci_templates/build.yml
@@ -229,44 +229,15 @@ steps:
 {!{- if eq $buildType "release" }!}
   - name: Check deckhouse images in prod registry
     if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
     id: check_images
     env:
       CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
       DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
     run: |
       set -x
       EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-      TAG=${CI_COMMIT_REF_SLUG}
-      IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-      REGISTRY_URL=${IMAGES_PATH}${EDITION}
-      INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-      echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-      if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-        docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-      fi
-
-      echo "Creating install container"
-      docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
-
-      IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-
-      for sha in ${IMAGES_SHA}; do
-        echo -n "Checking image ${sha}..."
-        OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-        if [ $? -ne 0 ]; then
-          echo -e "Error!\n"
-          echo $OUT
-          exit 1
-        else
-          echo "ok"
-        fi
-      done
-
-      echo "Deleting install container"
-      docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
 
+      ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 {!{- end }!}
 
   - name: Cleanup

diff --git a/.github/workflows/build-and-test_release.yml b/.github/workflows/build-and-test_release.yml
@@ -630,43 +630,15 @@ jobs:
           echo "tests_image_name=$(echo ${TESTS_IMAGE_NAME} | gzip | base64 -w0)" >> $GITHUB_OUTPUT
       - name: Check deckhouse images in prod registry
         if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
         id: check_images
         env:
           CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
           DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
         run: |
           set -x
           EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-          TAG=${CI_COMMIT_REF_SLUG}
-          IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-          REGISTRY_URL=${IMAGES_PATH}${EDITION}
-          INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-          echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-          if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-            docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-          fi
-
-          echo "Creating install container"
-          docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
-
-          IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
 
-          for sha in ${IMAGES_SHA}; do
-            echo -n "Checking image ${sha}..."
-            OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-            if [ $? -ne 0 ]; then
-              echo -e "Error!\n"
-              echo $OUT
-              exit 1
-            else
-              echo "ok"
-            fi
-          done
-
-          echo "Deleting install container"
-          docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
+          ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 
       - name: Cleanup
         if: ${{ always() }}
@@ -976,43 +948,15 @@ jobs:
           echo "tests_image_name=$(echo ${TESTS_IMAGE_NAME} | gzip | base64 -w0)" >> $GITHUB_OUTPUT
       - name: Check deckhouse images in prod registry
         if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
         id: check_images
         env:
           CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
           DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
         run: |
           set -x
           EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-          TAG=${CI_COMMIT_REF_SLUG}
-          IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-          REGISTRY_URL=${IMAGES_PATH}${EDITION}
-          INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-          echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-          if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-            docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-          fi
 
-          echo "Creating install container"
-          docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
-
-          IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-
-          for sha in ${IMAGES_SHA}; do
-            echo -n "Checking image ${sha}..."
-            OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-            if [ $? -ne 0 ]; then
-              echo -e "Error!\n"
-              echo $OUT
-              exit 1
-            else
-              echo "ok"
-            fi
-          done
-
-          echo "Deleting install container"
-          docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
+          ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 
       - name: Cleanup
         if: ${{ always() }}
@@ -1322,43 +1266,15 @@ jobs:
           echo "tests_image_name=$(echo ${TESTS_IMAGE_NAME} | gzip | base64 -w0)" >> $GITHUB_OUTPUT
       - name: Check deckhouse images in prod registry
         if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
         id: check_images
         env:
           CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
           DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
         run: |
           set -x
           EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-          TAG=${CI_COMMIT_REF_SLUG}
-          IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-          REGISTRY_URL=${IMAGES_PATH}${EDITION}
-          INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-          echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-          if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-            docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-          fi
-
-          echo "Creating install container"
-          docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
 
-          IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-
-          for sha in ${IMAGES_SHA}; do
-            echo -n "Checking image ${sha}..."
-            OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-            if [ $? -ne 0 ]; then
-              echo -e "Error!\n"
-              echo $OUT
-              exit 1
-            else
-              echo "ok"
-            fi
-          done
-
-          echo "Deleting install container"
-          docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
+          ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 
       - name: Cleanup
         if: ${{ always() }}
@@ -1668,43 +1584,15 @@ jobs:
           echo "tests_image_name=$(echo ${TESTS_IMAGE_NAME} | gzip | base64 -w0)" >> $GITHUB_OUTPUT
       - name: Check deckhouse images in prod registry
         if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
         id: check_images
         env:
           CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
           DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
         run: |
           set -x
           EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-          TAG=${CI_COMMIT_REF_SLUG}
-          IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-          REGISTRY_URL=${IMAGES_PATH}${EDITION}
-          INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-          echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-          if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-            docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-          fi
-
-          echo "Creating install container"
-          docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
 
-          IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-
-          for sha in ${IMAGES_SHA}; do
-            echo -n "Checking image ${sha}..."
-            OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-            if [ $? -ne 0 ]; then
-              echo -e "Error!\n"
-              echo $OUT
-              exit 1
-            else
-              echo "ok"
-            fi
-          done
-
-          echo "Deleting install container"
-          docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
+          ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 
       - name: Cleanup
         if: ${{ always() }}
@@ -2014,43 +1902,15 @@ jobs:
           echo "tests_image_name=$(echo ${TESTS_IMAGE_NAME} | gzip | base64 -w0)" >> $GITHUB_OUTPUT
       - name: Check deckhouse images in prod registry
         if: ${{ github.repository == 'deckhouse/deckhouse-test-1' && startsWith(github.ref, 'refs/tags/v') }}
-
         id: check_images
         env:
           CI_COMMIT_REF_SLUG: ${{needs.git_info.outputs.ci_commit_ref_slug}}
           DECKHOUSE_REGISTRY_READ_HOST: ${{secrets.DECKHOUSE_REGISTRY_READ_HOST}}
         run: |
           set -x
           EDITION=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
-          TAG=${CI_COMMIT_REF_SLUG}
-          IMAGES_PATH=${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
-          REGISTRY_URL=${IMAGES_PATH}${EDITION}
-          INSTALL_IMAGE_PATH=${REGISTRY_URL}/install:${TAG}
-
-          echo "Checking images for DKP ${EDITION} ${TAG} (${REGISTRY_URL})"
-          if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
-            docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
-          fi
-
-          echo "Creating install container"
-          docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
-
-          IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-
-          for sha in ${IMAGES_SHA}; do
-            echo -n "Checking image ${sha}..."
-            OUT=$(crane manifest ${REGISTRY_URL}@${sha} 2>&1)
-            if [ $? -ne 0 ]; then
-              echo -e "Error!\n"
-              echo $OUT
-              exit 1
-            else
-              echo "ok"
-            fi
-          done
 
-          echo "Deleting install container"
-          docker rm -f d8-install-${EDITION}-${TAG} 2>/dev/null
+          ./tools/check-release-images.sh --tag ${CI_COMMIT_REF_SLUG} --edition ${EDITION} --images-path ${DECKHOUSE_REGISTRY_READ_HOST}/deckhouse/
 
       - name: Cleanup
         if: ${{ always() }}

diff --git a/tools/check-release-images.sh b/tools/check-release-images.sh
@@ -103,6 +103,7 @@ if [ -n "`docker ps -a| grep d8-install-${EDITION}-${TAG}`" ]; then
   cleanup
 fi
 
+echo "Creating install container"
 docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
 
 IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
-Original file line number
+Diff line change
@@ Expand Up @@
       cleanup
     fi
+    echo "Creating install container"
     docker create --name d8-install-${EDITION}-${TAG} ${INSTALL_IMAGE_PATH}
     IMAGES_SHA=$(docker cp d8-install-${EDITION}-${TAG}:/deckhouse/candi/images_digests.json - | tar -Oxf - | grep -Eo "sha256:[a-f0-9]+")
@@ Expand Down @@