Skip to content

feat(EC-1868): use conforma/tekton-catalog for verify-conforma task #2271

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

Merged
johnbieren merged 2 commits into from
Jun 15, 2026
Merged

feat(EC-1868): use conforma/tekton-catalog for verify-conforma task #2271

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
8fa3608
feat(EC-1868): use conforma/tekton-catalog for conforma task
simonbaird Jun 4, 2026
4d0a9de
feat(EC-1868): bump conforma task sha with new script
simonbaird Jun 12, 2026
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
1 change: 0 additions & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ jobs:
github.event.pull_request.head.repo.html_url ||
github.event.merge_group.head_repo.html_url
}}
verify_ec_task_git_revision=main
mobster_tasks_git_revision=main
check-agents-md:
name: Check AGENTS.md line count
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/calunga-push-to-pulp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Release Components in a Snapshot to a pulp-backed python index. Each image in a
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| enterpriseContractTimeout | Timeout setting for `ec validate` | Yes | 40m0s |
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| taskGitUrl | The url to the git repo where the release-service-catalog tasks to be used are stored | Yes | https://github.com/konflux-ci/release-service-catalog.git |
| taskGitRevision | The revision in the taskGitUrl repo to be used | Yes | production |
| pulpBaseUrl | The base URL of the Pulp server | Yes | https://packages.redhat.com |
Expand Down
19 changes: 17 additions & 2 deletions pipelines/managed/calunga-push-to-pulp/calunga-push-to-pulp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ spec:
description: The location of the bundle containing the verify-enterprise-contract task
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: taskGitUrl
type: string
description: The url to the git repo where the release-service-catalog tasks to be used are stored
Expand Down Expand Up @@ -182,14 +183,28 @@ spec:
runAfter:
- collect-data

# TODO: This task is using an old git ref from a deprecated location. Migrating to
# the current latest Conforma task might require some param changes, so to avoid
# breaking something I'm leaving it untouched for now. Fix me soon I guess. The git
# sha being referenced is from "Jul 9 08:58:49 2025". It should be updated to the
# git resolver params used in all other pipelines in this repo, currently this:
#
# - name: url
# value: https://github.com/conforma/tekton-catalog
# - name: revision
# value: "1383873048e9bb8626c0e4b37c93da433b12e339"
# - name: pathInRepo
# value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
#
- name: verify-enterprise-contract
taskRef:
resolver: "git"
params:
# TODO: Should be changed to https://github.com/conforma/tekton-catalog
# and the revision should be updated. See longer explanation above.
- name: url
value: https://github.com/enterprise-contract/ec-cli
- name: revision
# TODO: How to keep this up to date?
value: cdfd9188f9352d7269ae1fe8c273a9e67f60ab8a
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ affected by RHTAP services or which results could affect the RHTAP workflow.
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| taskGitUrl | The url to the git repo where the release-service-catalog tasks to be used are stored | Yes | https://github.com/konflux-ci/release-service-catalog.git |
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
Expand Down
7 changes: 4 additions & 3 deletions pipelines/managed/e2e/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ spec:
description: The location of the bundle containing the verify-enterprise-contract task
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: taskGitUrl
type: string
description: The url to the git repo where the release-service-catalog tasks to be used are stored
Expand Down Expand Up @@ -104,9 +105,9 @@ spec:
resolver: "git"
params:
- name: url
value: https://github.com/conforma/cli
value: https://github.com/conforma/tekton-catalog
- name: revision
value: "$(params.verify_ec_task_git_revision)"
value: "1383873048e9bb8626c0e4b37c93da433b12e339"
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
Comment thread
simonbaird marked this conversation as resolved.
Comment thread
simonbaird marked this conversation as resolved.
Comment thread
simonbaird marked this conversation as resolved.
params:
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/fbc-release/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Tekton release pipeline to interact with FBC Pipeline
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| taskGitUrl | The url to the git repo where the release-service-catalog tasks to be used are stored | Yes | https://github.com/konflux-ci/release-service-catalog.git |
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
Expand Down
7 changes: 4 additions & 3 deletions pipelines/managed/fbc-release/fbc-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ spec:
description: The location of the bundle containing the verify-enterprise-contract task
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: taskGitUrl
type: string
description: The url to the git repo where the release-service-catalog tasks to be used are stored
Expand Down Expand Up @@ -233,9 +234,9 @@ spec:
resolver: "git"
params:
- name: url
value: https://github.com/conforma/cli
value: https://github.com/conforma/tekton-catalog
- name: revision
value: "$(params.verify_ec_task_git_revision)"
value: "1383873048e9bb8626c0e4b37c93da433b12e339"
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
params:
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/push-artifacts-to-cdn/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ It uses InternalRequests so that it can be run on both public and private cluste
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| taskGitUrl | The url to the git repo where the release-service-catalog tasks to be used are stored | Yes | https://github.com/konflux-ci/release-service-catalog.git |
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
Expand Down
7 changes: 4 additions & 3 deletions pipelines/managed/push-artifacts-to-cdn/push-artifacts-to-cdn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ spec:
description: The location of the bundle containing the verify-enterprise-contract task
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: taskGitUrl
type: string
description: The url to the git repo where the release-service-catalog tasks to be used are stored
Expand Down Expand Up @@ -237,9 +238,9 @@ spec:
resolver: "git"
params:
- name: url
value: https://github.com/conforma/cli
value: https://github.com/conforma/tekton-catalog
- name: revision
value: "$(params.verify_ec_task_git_revision)"
value: "1383873048e9bb8626c0e4b37c93da433b12e339"
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
params:
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/push-artifacts-to-storage/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Tekton pipeline to push rpms into the artifact storage instance.
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | Yes | brew-rhel-sst-prod |
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
| orasOptions | oras options to pass to Trusted Artifacts calls | Yes | "" |
| trustedArtifactsDebug | Flag to enable debug logging in trusted artifacts. Set to a non-empty string to enable | Yes | "" |
Expand Down
7 changes: 4 additions & 3 deletions pipelines/managed/push-artifacts-to-storage/push-artifacts-to-storage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ spec:
default: "pipeline_intention=release"
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: ociStorage
type: string
description: The OCI repository where the Trusted Artifacts are stored
Expand Down Expand Up @@ -200,9 +201,9 @@ spec:
resolver: "git"
params:
- name: url
value: https://github.com/conforma/cli
value: https://github.com/conforma/tekton-catalog
- name: revision
value: "$(params.verify_ec_task_git_revision)"
value: "1383873048e9bb8626c0e4b37c93da433b12e339"
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
params:
Expand Down
2 changes: 1 addition & 1 deletion pipelines/managed/push-disk-images-to-cdn/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Tekton Pipeline to push disk images to a cdn using pulp
| snapshot | The namespaced name (namespace/name) of the snapshot | No | - |
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver, now deprecated and ignored | Yes | ignored |
| taskGitUrl | The url to the git repo where the release-service-catalog tasks to be used are stored | Yes | https://github.com/konflux-ci/release-service-catalog.git |
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
Expand Down
7 changes: 4 additions & 3 deletions pipelines/managed/push-disk-images-to-cdn/push-disk-images-to-cdn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ spec:
default: "pipeline_intention=release"
- name: verify_ec_task_git_revision
type: string
description: The git revision to be used when consuming the verify-conforma task
description: Previously used for the Conforma task git resolver, now deprecated and ignored
default: ignored
- name: taskGitUrl
type: string
description: The url to the git repo where the release-service-catalog tasks to be used are stored
Expand Down Expand Up @@ -227,9 +228,9 @@ spec:
resolver: "git"
params:
- name: url
value: https://github.com/conforma/cli
value: https://github.com/conforma/tekton-catalog
- name: revision
value: "$(params.verify_ec_task_git_revision)"
value: "1383873048e9bb8626c0e4b37c93da433b12e339"
- name: pathInRepo
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
params:
Expand Down
Loading
Loading