Skip to content

Commit 1a5a43a

Browse files
simonbairdclaude
simonbaird
and
claude
committed
feat(EC-1868): use conforma/tekton-catalog for verify-conforma task
Switch the git resolver from conforma/cli to conforma/tekton-catalog and hard-code the revision SHA instead of using the verify_ec_task_git_revision param. The param is kept (unused) for backwards compatibility. Signed-off-by: Simon Baird <sbaird@redhat.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fda9f64 commit 1a5a43a

44 files changed

Lines changed: 108 additions & 86 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pipelines/managed/calunga-push-to-pulp/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Release Components in a Snapshot to a pulp-backed python index. Each image in a
1515
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
1616
| enterpriseContractTimeout | Timeout setting for `ec validate` | Yes | 40m0s |
1717
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
18-
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
18+
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver. Now deprecated and ignored. | Yes | ignored |
1919
| 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 |
2020
| taskGitRevision | The revision in the taskGitUrl repo to be used | Yes | production |
2121
| pulpBaseUrl | The base URL of the Pulp server | Yes | https://packages.redhat.com |

‎pipelines/managed/calunga-push-to-pulp/calunga-push-to-pulp.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ spec:
4242
description: The location of the bundle containing the verify-enterprise-contract task
4343
- name: verify_ec_task_git_revision
4444
type: string
45-
description: The git revision to be used when consuming the verify-conforma task
45+
description: Previously used for the Conforma task git resolver. Now deprecated and ignored.
46+
default: ignored
4647
- name: taskGitUrl
4748
type: string
4849
description: The url to the git repo where the release-service-catalog tasks to be used are stored

‎pipelines/managed/e2e/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ affected by RHTAP services or which results could affect the RHTAP workflow.
1515
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
1616
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
1717
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
18-
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
18+
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver. Now deprecated and ignored. | Yes | ignored |
1919
| 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 |
2020
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
2121
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |

‎pipelines/managed/e2e/e2e.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ spec:
4141
description: The location of the bundle containing the verify-enterprise-contract task
4242
- name: verify_ec_task_git_revision
4343
type: string
44-
description: The git revision to be used when consuming the verify-conforma task
44+
description: Previously used for the Conforma task git resolver. Now deprecated and ignored.
45+
default: ignored
4546
- name: taskGitUrl
4647
type: string
4748
description: The url to the git repo where the release-service-catalog tasks to be used are stored
@@ -104,9 +105,9 @@ spec:
104105
resolver: "git"
105106
params:
106107
- name: url
107-
value: https://github.com/conforma/cli
108+
value: https://github.com/conforma/tekton-catalog
108109
- name: revision
109-
value: "$(params.verify_ec_task_git_revision)"
110+
value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
110111
- name: pathInRepo
111112
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
112113
params:

‎pipelines/managed/fbc-release/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Tekton release pipeline to interact with FBC Pipeline
1414
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
1515
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
1616
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
17-
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
17+
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver. Now deprecated and ignored. | Yes | ignored |
1818
| 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 |
1919
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
2020
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |

‎pipelines/managed/fbc-release/fbc-release.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ spec:
4040
description: The location of the bundle containing the verify-enterprise-contract task
4141
- name: verify_ec_task_git_revision
4242
type: string
43-
description: The git revision to be used when consuming the verify-conforma task
43+
description: Previously used for the Conforma task git resolver. Now deprecated and ignored.
44+
default: ignored
4445
- name: taskGitUrl
4546
type: string
4647
description: The url to the git repo where the release-service-catalog tasks to be used are stored
@@ -233,9 +234,9 @@ spec:
233234
resolver: "git"
234235
params:
235236
- name: url
236-
value: https://github.com/conforma/cli
237+
value: https://github.com/conforma/tekton-catalog
237238
- name: revision
238-
value: "$(params.verify_ec_task_git_revision)"
239+
value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
239240
- name: pathInRepo
240241
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
241242
params:

‎pipelines/managed/push-artifacts-to-cdn/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ It uses InternalRequests so that it can be run on both public and private cluste
1515
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | No | - |
1616
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
1717
| verify_ec_task_bundle | The location of the bundle containing the verify-enterprise-contract task | No | - |
18-
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
18+
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver. Now deprecated and ignored. | Yes | ignored |
1919
| 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 |
2020
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
2121
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |

‎pipelines/managed/push-artifacts-to-cdn/push-artifacts-to-cdn.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ spec:
4141
description: The location of the bundle containing the verify-enterprise-contract task
4242
- name: verify_ec_task_git_revision
4343
type: string
44-
description: The git revision to be used when consuming the verify-conforma task
44+
description: Previously used for the Conforma task git resolver. Now deprecated and ignored.
45+
default: ignored
4546
- name: taskGitUrl
4647
type: string
4748
description: The url to the git repo where the release-service-catalog tasks to be used are stored
@@ -237,9 +238,9 @@ spec:
237238
resolver: "git"
238239
params:
239240
- name: url
240-
value: https://github.com/conforma/cli
241+
value: https://github.com/conforma/tekton-catalog
241242
- name: revision
242-
value: "$(params.verify_ec_task_git_revision)"
243+
value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
243244
- name: pathInRepo
244245
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
245246
params:

‎pipelines/managed/push-artifacts-to-storage/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Tekton pipeline to push rpms into the artifact storage instance.
1515
| taskGitRevision | The revision in the taskGitUrl repo to be used | No | - |
1616
| enterpriseContractPolicy | JSON representation of the EnterpriseContractPolicy | Yes | brew-rhel-sst-prod |
1717
| enterpriseContractExtraRuleData | Extra rule data to be merged into the policy specified in params.enterpriseContractPolicy. Use syntax "key1=value1,key2=value2..." | Yes | pipeline_intention=release |
18-
| verify_ec_task_git_revision | The git revision to be used when consuming the verify-conforma task | No | - |
18+
| verify_ec_task_git_revision | Previously used for the Conforma task git resolver. Now deprecated and ignored. | Yes | ignored |
1919
| ociStorage | The OCI repository where the Trusted Artifacts are stored | Yes | quay.io/konflux-ci/release-service-trusted-artifacts |
2020
| orasOptions | oras options to pass to Trusted Artifacts calls | Yes | "" |
2121
| trustedArtifactsDebug | Flag to enable debug logging in trusted artifacts. Set to a non-empty string to enable | Yes | "" |

‎pipelines/managed/push-artifacts-to-storage/push-artifacts-to-storage.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ spec:
4545
default: "pipeline_intention=release"
4646
- name: verify_ec_task_git_revision
4747
type: string
48-
description: The git revision to be used when consuming the verify-conforma task
48+
description: Previously used for the Conforma task git resolver. Now deprecated and ignored.
49+
default: ignored
4950
- name: ociStorage
5051
type: string
5152
description: The OCI repository where the Trusted Artifacts are stored
@@ -200,9 +201,9 @@ spec:
200201
resolver: "git"
201202
params:
202203
- name: url
203-
value: https://github.com/conforma/cli
204+
value: https://github.com/conforma/tekton-catalog
204205
- name: revision
205-
value: "$(params.verify_ec_task_git_revision)"
206+
value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
206207
- name: pathInRepo
207208
value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
208209
params:

0 commit comments

Comments
 (0)