Merge branch 'main' into git-ca-bundle

konflux-ci · Mar 5, 2024 · 6de9147 · 6de9147
2 parents 8e9d7bf + da638c3
commit 6de9147
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/.github/workflows/shellspec.yaml b/.github/workflows/shellspec.yaml
diff --git a/policies/all-tasks.yaml b/policies/all-tasks.yaml
@@ -13,7 +13,5 @@ sources:
       exclude:
         # https://issues.redhat.com/browse/KFLUXBUGS-1111
         - step_image_registries.step_images_permitted:generate-odcs-compose/noversion
-        # https://issues.redhat.com/browse/EC-425
-        - step_image_registries.step_images_permitted:tkn-bundle/0.1
         # https://issues.redhat.com/browse/KFLUXBUGS-1110
         - step_image_registries.step_images_permitted:verify-signed-rpms/noversion
diff --git a/renovate.json b/renovate.json
@@ -29,7 +29,7 @@
         "quay.io/enterprise-contract/"
       ],
       "matchPackageNames": [
-        "quay.io/openshift-pipeline/openshift-pipelines-cli-tkn"
+        "registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8"
       ],
       "groupName": "ec",
       "reviewers": ["zregvart", "lcarva"]

diff --git a/task/tkn-bundle/0.1/tkn-bundle.yaml b/task/tkn-bundle/0.1/tkn-bundle.yaml
@@ -110,7 +110,7 @@ spec:
 
       printf "%s\n" "${FILES[@]}" > "${TASK_FILE}"
     workingDir: $(workspaces.source.path)
-  - image: quay.io/openshift-pipeline/openshift-pipelines-cli-tkn:5.0
+  - image: registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8:v1.13.1@sha256:575faccd21c06a4f33e39382b9dc17681c60b41ef0e124d2980b75c39909c36a
     name: build
     env:
     - name: CONTEXT