Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): use bundle image digest instead of tag (PROJQUAY-2556) #557

Merged
merged 2 commits into from
Oct 4, 2021
Merged

fix(build): use bundle image digest instead of tag (PROJQUAY-2556) #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29cfb26
fix(build): use bundle image digest instead of tag (PROJQUAY-2556)
flavianmissi Oct 4, 2021
63417cc
fix(e2e): increase timeout (PROJQUAY-2556)
flavianmissi Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build-and-publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
11 changes: 6 additions & 5 deletions .github/workflows/e2e-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down