From 38eca867f978e9cfed5019ff058686a99c93c2ea Mon Sep 17 00:00:00 2001 From: Tomas Turek Date: Thu, 18 Jun 2026 12:43:30 +0200 Subject: [PATCH] Migrate PCO FBC pipelines to release-branch triggers - Replace push+PR pipelines with push-only, release-branch triggers - Drop v4.15, add v4.22 - Add policy-controller-operator to catalog sync workflow - Single application label (pco-fbc) across all versions SECURESIGN-4332 Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/sync-catalog.yaml | 4 +- .tekton/pco-fbc-v4-15-pull-request.yaml | 53 ------------------ .tekton/pco-fbc-v4-16-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-16-push.yaml | 9 +-- .tekton/pco-fbc-v4-17-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-17-push.yaml | 9 +-- .tekton/pco-fbc-v4-18-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-18-push.yaml | 9 +-- .tekton/pco-fbc-v4-19-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-19-push.yaml | 9 +-- .tekton/pco-fbc-v4-20-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-20-push.yaml | 9 +-- .tekton/pco-fbc-v4-21-pull-request.yaml | 55 ------------------- .tekton/pco-fbc-v4-21-push.yaml | 9 +-- ...4-15-push.yaml => pco-fbc-v4-22-push.yaml} | 21 ++++--- 15 files changed, 43 insertions(+), 419 deletions(-) delete mode 100644 .tekton/pco-fbc-v4-15-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-16-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-17-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-18-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-19-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-20-pull-request.yaml delete mode 100644 .tekton/pco-fbc-v4-21-pull-request.yaml rename .tekton/{pco-fbc-v4-15-push.yaml => pco-fbc-v4-22-push.yaml} (65%) diff --git a/.github/workflows/sync-catalog.yaml b/.github/workflows/sync-catalog.yaml index e9b9d2b0..7a14b078 100644 --- a/.github/workflows/sync-catalog.yaml +++ b/.github/workflows/sync-catalog.yaml @@ -6,9 +6,7 @@ on: workflow_dispatch: env: - # TODO: Uncomment this when are sure that we want to sync all packages - #SUPPORTED_PACKAGES: "rhtas-operator|model-validation-operator|policy-controller-operator" - SUPPORTED_PACKAGES: "rhtas-operator" + SUPPORTED_PACKAGES: "rhtas-operator|policy-controller-operator" jobs: update-catalogs: diff --git a/.tekton/pco-fbc-v4-15-pull-request.yaml b/.tekton/pco-fbc-v4-15-pull-request.yaml deleted file mode 100644 index 8528f57b..00000000 --- a/.tekton/pco-fbc-v4-15-pull-request.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.15/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-15-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-15 - appstudio.openshift.io/component: pco-fbc-v4-15 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-15-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-15:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.15/policy-controller-operator - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-15 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-16-pull-request.yaml b/.tekton/pco-fbc-v4-16-pull-request.yaml deleted file mode 100644 index 88b6fe48..00000000 --- a/.tekton/pco-fbc-v4-16-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-16 - appstudio.openshift.io/component: pco-fbc-v4-16 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-16-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-16:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.16/policy-controller-operator - - name: ocp-release-version - value: "v4.16" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-16 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-16-push.yaml b/.tekton/pco-fbc-v4-16-push.yaml index 130fb14e..85d76994 100644 --- a/.tekton/pco-fbc-v4-16-push.yaml +++ b/.tekton/pco-fbc-v4-16-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.16/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-16-pull-request.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.16/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-16-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-16 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-16 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-16-on-push diff --git a/.tekton/pco-fbc-v4-17-pull-request.yaml b/.tekton/pco-fbc-v4-17-pull-request.yaml deleted file mode 100644 index ffc40a1c..00000000 --- a/.tekton/pco-fbc-v4-17-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-17 - appstudio.openshift.io/component: pco-fbc-v4-17 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-17-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-17:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.17/policy-controller-operator - - name: ocp-release-version - value: "v4.17" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-17 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-17-push.yaml b/.tekton/pco-fbc-v4-17-push.yaml index 1a2afc82..35c94fbb 100644 --- a/.tekton/pco-fbc-v4-17-push.yaml +++ b/.tekton/pco-fbc-v4-17-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.17/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-17-pull-request.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.17/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-17-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-17 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-17 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-17-on-push diff --git a/.tekton/pco-fbc-v4-18-pull-request.yaml b/.tekton/pco-fbc-v4-18-pull-request.yaml deleted file mode 100644 index 0a4c6677..00000000 --- a/.tekton/pco-fbc-v4-18-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-18 - appstudio.openshift.io/component: pco-fbc-v4-18 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-18-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-18:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.18/policy-controller-operator - - name: ocp-release-version - value: "v4.18" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-18 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-18-push.yaml b/.tekton/pco-fbc-v4-18-push.yaml index aea4af4e..7b222266 100644 --- a/.tekton/pco-fbc-v4-18-push.yaml +++ b/.tekton/pco-fbc-v4-18-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.18/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-18-pull-request.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.18/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-18-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-18 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-18 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-18-on-push diff --git a/.tekton/pco-fbc-v4-19-pull-request.yaml b/.tekton/pco-fbc-v4-19-pull-request.yaml deleted file mode 100644 index 7faf208f..00000000 --- a/.tekton/pco-fbc-v4-19-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-19 - appstudio.openshift.io/component: pco-fbc-v4-19 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-19-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-19:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.19/policy-controller-operator - - name: ocp-release-version - value: "v4.19" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-19 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-19-push.yaml b/.tekton/pco-fbc-v4-19-push.yaml index 3a167fb2..1660c49d 100644 --- a/.tekton/pco-fbc-v4-19-push.yaml +++ b/.tekton/pco-fbc-v4-19-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.19/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-19-pull-request.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.19/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-19-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-19 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-19 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-19-on-push diff --git a/.tekton/pco-fbc-v4-20-pull-request.yaml b/.tekton/pco-fbc-v4-20-pull-request.yaml deleted file mode 100644 index 07817245..00000000 --- a/.tekton/pco-fbc-v4-20-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-20 - appstudio.openshift.io/component: pco-fbc-v4-20 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-20-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-20:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.20/policy-controller-operator - - name: ocp-release-version - value: "v4.20" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-20 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-20-push.yaml b/.tekton/pco-fbc-v4-20-push.yaml index 1d5992ca..37336c0c 100644 --- a/.tekton/pco-fbc-v4-20-push.yaml +++ b/.tekton/pco-fbc-v4-20-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.20/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-20-push.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.20/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-20-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-20 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-20 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-20-on-push diff --git a/.tekton/pco-fbc-v4-21-pull-request.yaml b/.tekton/pco-fbc-v4-21-pull-request.yaml deleted file mode 100644 index 9fef368b..00000000 --- a/.tekton/pco-fbc-v4-21-pull-request.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: tekton.dev/v1 -kind: PipelineRun -metadata: - annotations: - build.appstudio.openshift.io/repo: https://github.com/securesign/fbc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' - pipelinesascode.tekton.dev/cancel-in-progress: "true" - pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "main" && ( "v4.21/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-21-pull-request.yaml".pathChanged() - ) - creationTimestamp: null - labels: - appstudio.openshift.io/application: pco-fbc-v4-21 - appstudio.openshift.io/component: pco-fbc-v4-21 - pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-21-on-pull-request - namespace: rhtas-tenant -spec: - params: - - name: git-url - value: '{{source_url}}' - - name: revision - value: '{{revision}}' - - name: output-image - value: quay.io/securesign/pco-fbc-v4-21:on-pr-{{revision}} - - name: image-expires-after - value: 5d - - name: build-platforms - value: - - linux/x86_64 - - name: dockerfile - value: catalog.Dockerfile - - name: path-context - value: v4.21/policy-controller-operator - - name: ocp-release-version - value: "v4.21" - pipelineRef: - params: - - name: url - value: https://github.com/securesign/pipelines.git - - name: revision - value: main - - name: pathInRepo - value: pipelines/fbc-builder.yaml - resolver: git - taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-21 - workspaces: - - name: git-auth - secret: - secretName: '{{ git_auth_secret }}' -status: {} diff --git a/.tekton/pco-fbc-v4-21-push.yaml b/.tekton/pco-fbc-v4-21-push.yaml index e4bc24e1..ee0193fa 100644 --- a/.tekton/pco-fbc-v4-21-push.yaml +++ b/.tekton/pco-fbc-v4-21-push.yaml @@ -7,12 +7,13 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.21/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-21-push.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.21/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-21-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-21 + appstudio.openshift.io/application: pco-fbc appstudio.openshift.io/component: pco-fbc-v4-21 pipelines.appstudio.openshift.io/type: build name: pco-fbc-v4-21-on-push diff --git a/.tekton/pco-fbc-v4-15-push.yaml b/.tekton/pco-fbc-v4-22-push.yaml similarity index 65% rename from .tekton/pco-fbc-v4-15-push.yaml rename to .tekton/pco-fbc-v4-22-push.yaml index 44040276..e382597c 100644 --- a/.tekton/pco-fbc-v4-15-push.yaml +++ b/.tekton/pco-fbc-v4-22-push.yaml @@ -7,15 +7,16 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/cancel-in-progress: "false" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "main" && ( "v4.15/policy-controller-operator/***".pathChanged() || ".tekton/pco-fbc-v4-15-pull-request.yaml".pathChanged() - ) + pipelinesascode.tekton.dev/on-cel-expression: | + event == "push" + && target_branch.matches('^release-.*$') + && ( "v4.22/policy-controller-operator/**".pathChanged() || ".tekton/pco-fbc-v4-22-push.yaml".pathChanged() ) creationTimestamp: null labels: - appstudio.openshift.io/application: pco-fbc-v4-15 - appstudio.openshift.io/component: pco-fbc-v4-15 + appstudio.openshift.io/application: pco-fbc + appstudio.openshift.io/component: pco-fbc-v4-22 pipelines.appstudio.openshift.io/type: build - name: pco-fbc-v4-15-on-push + name: pco-fbc-v4-22-on-push namespace: rhtas-tenant spec: params: @@ -24,14 +25,16 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/securesign/pco-fbc-v4-15:{{revision}} + value: quay.io/securesign/pco-fbc-v4-22:{{revision}} - name: build-platforms value: - linux/x86_64 - name: dockerfile value: catalog.Dockerfile - name: path-context - value: v4.15/policy-controller-operator + value: v4.22/policy-controller-operator + - name: ocp-release-version + value: "v4.22" pipelineRef: params: - name: url @@ -42,7 +45,7 @@ spec: value: pipelines/fbc-builder.yaml resolver: git taskRunTemplate: - serviceAccountName: build-pipeline-pco-fbc-v4-15 + serviceAccountName: build-pipeline-pco-fbc-v4-22 workspaces: - name: git-auth secret: