@@ -113,27 +113,46 @@ jobs:
113113 - name : Set up QEMU
114114 uses : docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
115115
116- - name : Registry login (quay.io/enterprise-contract)
117- run : podman login -u ${{ secrets.BUNDLE_PUSH_USER_EC }} -p ${{ secrets.BUNDLE_PUSH_PASS_EC }} quay.io
118-
119116 - name : Registry login (quay.io/conforma)
120117 run : podman login -u ${{ secrets.BUNDLE_PUSH_USER_CONFORMA }} -p ${{ secrets.BUNDLE_PUSH_PASS_CONFORMA }} quay.io
121118
122119 - name : Create and push image (quay.io/conforma/cli)
120+ env :
121+ IMAGE_REPO : quay.io/conforma/cli
123122 run : make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=$IMAGE_REPO ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
124123
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+
125127 - name : Create and push image (quay.io/enterprise-contract/ec-cli)
126- run : make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=quay.io/enterprise-contract/ec-cli ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
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"
127131
128132 # verify ec works in the image and show the version
129- - name : verify the ec image
133+ - name : verify the ec image (quay.io/conforma/cli)
130134 env :
131135 IMAGE_TAG : snapshot
136+ IMAGE_REPO : quay.io/conforma/cli
132137 run : make verify-image
133138
139+ - name : verify the ec image (quay.io/enterprise-contract/ec-cli)
140+ env :
141+ IMAGE_TAG : snapshot
142+ IMAGE_REPO : quay.io/enterprise-contract/ec-cli
143+ run : make verify-image
144+
145+ - name : Create and push the tekton bundle (quay.io/conforma/ec-task-bundle)
146+ env :
147+ TASK_REPO : quay.io/conforma/ec-task-bundle
148+ IMAGE_REPO : quay.io/conforma/cli
149+ TASKS : " tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
150+ 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)')
151+
134152 - name : Create and push the tekton bundle (quay.io/enterprise-contract/ec-task-bundle)
135153 env :
136154 TASK_REPO : quay.io/enterprise-contract/ec-task-bundle
155+ IMAGE_REPO : quay.io/enterprise-contract/ec-cli
137156 TASKS : " tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
138157 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)')
139158
0 commit comments