fix(build): use bundle image digest instead of tag (PROJQUAY-2556) (q…

…uay#557) and use env var to set it. increase e2e timeout too, as 3 minutes ins't always enough for the mirror to get up and running.
flavianmissi · Oct 4, 2021 · df8d8a5 · df8d8a5
1 parent fa74e30
commit df8d8a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -159,12 +159,18 @@ jobs:
           push: true
           tags: ${{ env.BUNDLE }}:${{ env.TAG }}
 
+      - name: Get bundle image digest
+        id: bundle-image
+        run: |
+          docker pull "${OPERATOR_IMAGE}"
+          echo "::set-output name=digest::$(docker inspect --format='{{index .RepoDigests 0}}' ${{ env.BUNDLE }}:${{ env.TAG })"
+
       - name: Publish Catalog Index
         env:
           OPM_DOWNLOAD_URL: https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-4.6/
           OPM_TAR: opm-linux.tar.gz
         run: |
           wget -q "${OPM_DOWNLOAD_URL}/${OPM_TAR}"
           tar xvf "${OPM_TAR}"
-          ./opm index add --build-tool docker --bundles "${BUNDLE}:${TAG}" --tag "${INDEX}:${TAG}"
+          ./opm index add --build-tool docker --bundles "${{steps.bundle-image.outputs.digest}}" --tag "${INDEX}:${TAG}"
           docker push "${INDEX}:${TAG}"
diff --git a/.github/workflows/e2e-nightly.yaml b/.github/workflows/e2e-nightly.yaml
@@ -26,6 +26,7 @@ jobs:
       QUAY_SAMPLE_PATH: ./config/samples/managed.quayregistry.yaml
       OPERATOR_PKG_NAME: quay-operator-test
       NAMESPACE: quay-operator-e2e-nightly
+      WAIT_TIMEOUT: 10m
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
@@ -95,35 +96,35 @@ jobs:
         env:
           KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-database --timeout=3m
+          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-database --timeout=${{ env.WAIT_TIMEOUT }}
 
       - name: Ensure redis rollout
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-redis --timeout=3m
+          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-redis --timeout=${{ env.WAIT_TIMEOUT }}
 
       - name: Ensure config editor rollout
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-config-editor --timeout=3m
+          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-config-editor --timeout=${{ env.WAIT_TIMEOUT }}
 
       - name: Ensure Quay rollout
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-app --timeout=3m
+          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-app --timeout=${{ env.WAIT_TIMEOUT }}
 
       - name: Ensure mirror rollout
         uses: actions-hub/kubectl@master
         env:
           KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-mirror --timeout=3m
+          args: rollout -n ${{ env.NAMESPACE }} status deployment skynet-quay-mirror --timeout=${{ env.WAIT_TIMEOUT }}
 
       - name: Delete Quay deployment
         uses: actions-hub/kubectl@master