From ed8399fb2ce8f6c675ba717a880422a01d26d328 Mon Sep 17 00:00:00 2001 From: Sayan Biswas Date: Tue, 9 Jul 2024 04:56:42 +0530 Subject: [PATCH] Update pipeline for z-stream support Changes: - Update application, component and PAC branch to allow CI to build from z-stream. --- .tekton/openshift-builds-operator-pull-request.yaml | 12 ++++++------ .tekton/openshift-builds-operator-push.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.tekton/openshift-builds-operator-pull-request.yaml b/.tekton/openshift-builds-operator-pull-request.yaml index 7bde4b73..9b5a2cae 100644 --- a/.tekton/openshift-builds-operator-pull-request.yaml +++ b/.tekton/openshift-builds-operator-pull-request.yaml @@ -2,7 +2,7 @@ apiVersion: tekton.dev/v1 kind: PipelineRun metadata: annotations: - build.appstudio.openshift.io/repo: https://github.com/redhat-openshift-builds/operator?rev={{revision}} + build.appstudio.openshift.io/repo: https://github.com/sayan-biswas/openshift-builds-operator?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}}' @@ -10,18 +10,18 @@ metadata: pipelinesascode.tekton.dev/task: "[.tekton/openshift-builds-operator-unit-test.yaml]" pipelinesascode.tekton.dev/on-cel-expression: | event == "pull_request" && - target_branch == "main" && + target_branch == "builds-1.1" && files.all.exists(x, x.matches('.tekton/|api/|internal/|test/')) || files.all.exists(x, x.matches('main.go|go.mod|go.sum|Dockerfile')) || files.all.exists(x, x.matches('.tekton/openshift-builds-operator-unit-test.yaml')) || files.all.exists(x, x.matches('.tekton/openshift-builds-operator-pull-request.yaml')) creationTimestamp: null labels: - appstudio.openshift.io/application: openshift-builds - appstudio.openshift.io/component: openshift-builds-operator + appstudio.openshift.io/application: openshift-builds-1-1 + appstudio.openshift.io/component: openshift-builds-operator-1-1 pipelines.appstudio.openshift.io/type: build name: openshift-builds-operator-on-pull-request - namespace: rh-openshift-builds-tenant + namespace: rh-ee-sabiswas-tenant spec: params: - name: git-url @@ -29,7 +29,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds/openshift-builds-operator:on-pr-{{revision}} + value: quay.io/redhat-user-workloads/rh-ee-sabiswas-tenant/openshift-builds/openshift-builds-operator:on-pr-{{revision}} - name: image-expires-after value: 5d - name: dockerfile diff --git a/.tekton/openshift-builds-operator-push.yaml b/.tekton/openshift-builds-operator-push.yaml index 18e31cd1..787fd789 100644 --- a/.tekton/openshift-builds-operator-push.yaml +++ b/.tekton/openshift-builds-operator-push.yaml @@ -2,25 +2,25 @@ apiVersion: tekton.dev/v1 kind: PipelineRun metadata: annotations: - build.appstudio.openshift.io/repo: https://github.com/redhat-openshift-builds/operator?rev={{revision}} + build.appstudio.openshift.io/repo: https://github.com/sayan-biswas/openshift-builds-operator?rev={{revision}} build.appstudio.redhat.com/commit_sha: '{{revision}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/task: "[.tekton/openshift-builds-operator-unit-test.yaml]" pipelinesascode.tekton.dev/on-cel-expression: | event == "push" && - target_branch == "main" && + target_branch == "builds-1.1" && files.all.exists(x, x.matches('.tekton/|api/|internal/|test/')) || files.all.exists(x, x.matches('main.go|go.mod|go.sum|Dockerfile')) || files.all.exists(x, x.matches('.tekton/openshift-builds-operator-unit-test.yaml')) || files.all.exists(x, x.matches('.tekton/openshift-builds-operator-push.yaml')) creationTimestamp: null labels: - appstudio.openshift.io/application: openshift-builds - appstudio.openshift.io/component: openshift-builds-operator + appstudio.openshift.io/application: openshift-builds-1-1 + appstudio.openshift.io/component: openshift-builds-operator-1-1 pipelines.appstudio.openshift.io/type: build name: openshift-builds-operator-on-push - namespace: rh-openshift-builds-tenant + namespace: rh-ee-sabiswas-tenant spec: params: - name: git-url @@ -28,7 +28,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds/openshift-builds-operator:{{revision}} + value: quay.io/redhat-user-workloads/rh-ee-sabiswas-tenant/openshift-builds/openshift-builds-operator:{{revision}} - name: dockerfile value: Dockerfile pipelineSpec: