Skip to content

Commit e05fc8f

Browse files
committed
Include new keyless params task in bundle pushes
There are pushes happening in both Konflux and GitHub, and each of those pushes to the new and old locations. I added the new task everywhere, even the deprecated repo. Ref: https://redhat.atlassian.net/browse/EC-1695
1 parent a81c464 commit e05fc8f

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/release.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,18 @@ jobs:
148148
env:
149149
TASK_REPO: quay.io/conforma/tekton-task
150150
IMAGE_REPO: quay.io/conforma/cli
151-
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
151+
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml tasks/collect-keyless-params/0.1/collect-keyless-params.yaml"
152152
run: make task-bundle-snapshot TASK_REPO=$TASK_REPO TASK_TAG=$TAG ADD_TASK_TAG="$TAG_TIMESTAMP snapshot" TASKS=<( yq e ".spec.steps[].image? = \"$IMAGE_REPO:$TAG\"" $TASKS | yq 'select(. != null)')
153153

154154
- name: Registry login (quay.io/enterprise-contract)
155155
run: podman login -u ${{ secrets.BUNDLE_PUSH_USER_EC }} -p ${{ secrets.BUNDLE_PUSH_PASS_EC }} quay.io
156156

157+
# This repo is deprecated and probably no one uses it any more. At some point we should stop updating it.
157158
- name: Create and push the tekton bundle (quay.io/enterprise-contract/ec-task-bundle)
158159
env:
159160
TASK_REPO: quay.io/enterprise-contract/ec-task-bundle
160161
IMAGE_REPO: quay.io/enterprise-contract/ec-cli
161-
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
162+
TASKS: "tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml tasks/collect-keyless-params/0.1/collect-keyless-params.yaml"
162163
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)')
163164

164165
- name: Download statistics

.tekton/cli-main-pull-request.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,10 @@ spec:
298298
- name: IMAGE
299299
value: $(params.output-image).bundle
300300
- name: CONTEXT
301-
value: tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
301+
value: >-
302+
tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml
303+
tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
304+
tasks/collect-keyless-params/0.1/collect-keyless-params.yaml
302305
- name: STEPS_IMAGE
303306
value: $(params.bundle-cli-ref-repo)@$(tasks.build-image-index.results.IMAGE_DIGEST)
304307
- name: URL

.tekton/cli-main-push.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,10 @@ spec:
300300
- name: IMAGE
301301
value: $(params.output-image).bundle
302302
- name: CONTEXT
303-
value: tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
303+
value: >-
304+
tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml
305+
tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml
306+
tasks/collect-keyless-params/0.1/collect-keyless-params.yaml
304307
- name: STEPS_IMAGE
305308
value: $(params.bundle-cli-ref-repo)@$(tasks.build-image-index.results.IMAGE_DIGEST)
306309
- name: URL

0 commit comments

Comments
 (0)