Skip to content

Commit 1fbf6dc

Browse files
committed
chore: update release.yaml to use two quay repos
This commit updates the release process so that it pushes to `quay.io/enterprise-contract/ec-cli` as well as `quay.io/conforma/cli`. Ref: EC-1110 Signed-off-by: Rob Nester <rnester@redhat.com>
1 parent 500e776 commit 1fbf6dc

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

.github/workflows/release.yaml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jobs:
113113
- name: Set up QEMU
114114
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
115115

116+
## Conforma
116117
- name: Registry login (quay.io/conforma)
117118
run: podman login -u ${{ secrets.BUNDLE_PUSH_USER_CONFORMA }} -p ${{ secrets.BUNDLE_PUSH_PASS_CONFORMA }} quay.io
118119

@@ -121,26 +122,19 @@ jobs:
121122
IMAGE_REPO: quay.io/conforma/cli
122123
run: make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=$IMAGE_REPO ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
123124

124-
- name: Registry login (quay.io/enterprise-contract)
125-
run: podman login -u ${{ secrets.BUNDLE_PUSH_USER_EC }} -p ${{ secrets.BUNDLE_PUSH_PASS_EC }} quay.io
126-
127-
- name: Create and push image (quay.io/enterprise-contract/ec-cli)
128-
env:
129-
IMAGE_REPO: quay.io/enterprise-contract/ec-cli
130-
run: make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=$IMAGE_REPO ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
131-
132125
# verify ec works in the image and show the version
133126
- name: verify the ec image (quay.io/conforma/cli)
134127
env:
135128
IMAGE_TAG: snapshot
136129
IMAGE_REPO: quay.io/conforma/cli
137130
run: make verify-image
138131

139-
- name: verify the ec image (quay.io/enterprise-contract/ec-cli)
132+
- name: Create and push the tekton bundle (quay.io/conforma/ec-task-bundle)
140133
env:
141-
IMAGE_TAG: snapshot
142-
IMAGE_REPO: quay.io/enterprise-contract/ec-cli
143-
run: make verify-image
134+
TASK_REPO: quay.io/conforma/ec-task-bundle
135+
IMAGE_REPO: quay.io/conforma/cli
136+
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
137+
run: make task-bundle-snapshot TASK_REPO=$TASK_REPO TASK_TAG=$TAG ADD_TASK_TAG="$TAG_TIMESTAMP" TASKS=<( yq e ".spec.steps[].image? = \"$IMAGE_REPO:$TAG\"" $TASKS | yq 'select(. != null)')
144138

145139
- name: Create and push the tekton bundle (quay.io/conforma/ec-task-bundle)
146140
env:
@@ -149,6 +143,22 @@ jobs:
149143
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
150144
run: make task-bundle-snapshot TASK_REPO=$TASK_REPO TASK_TAG=$TAG ADD_TASK_TAG="$TAG_TIMESTAMP" TASKS=<( yq e ".spec.steps[].image? = \"$IMAGE_REPO:$TAG\"" $TASKS | yq 'select(. != null)')
151145

146+
# Enterprise Contract
147+
- name: Registry login (quay.io/enterprise-contract)
148+
run: podman login -u ${{ secrets.BUNDLE_PUSH_USER_EC }} -p ${{ secrets.BUNDLE_PUSH_PASS_EC }} quay.io
149+
150+
- name: Create and push image (quay.io/enterprise-contract/ec-cli)
151+
env:
152+
IMAGE_REPO: quay.io/enterprise-contract/ec-cli
153+
run: make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=$IMAGE_REPO ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
154+
155+
# verify ec works in the image and show the version
156+
- name: verify the ec image (quay.io/enterprise-contract/ec-cli)
157+
env:
158+
IMAGE_TAG: snapshot
159+
IMAGE_REPO: quay.io/enterprise-contract/ec-cli
160+
run: make verify-image
161+
152162
- name: Create and push the tekton bundle (quay.io/enterprise-contract/ec-task-bundle)
153163
env:
154164
TASK_REPO: quay.io/enterprise-contract/ec-task-bundle

0 commit comments

Comments
 (0)