Skip to content

Commit

Permalink
Add builds 1.2 (#258)
Browse files Browse the repository at this point in the history
Changes:
- Update application and component in tekton pipelines to point to
Builds 1.2 in Konflux
  • Loading branch information
sayan-biswas authored Nov 11, 2024
2 parents fd03c01 + 198c6b2 commit a253621
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 84 deletions.
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-controller-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('version/|pkg/controller/|pkg/client|pkg/reconciler|pkg/volumes|pkg/validate|pkg/env|pkg/metrics/|pkg/apis/|pkg/config/|pkg/ctxlog/|cmd/shipwright-build-controller/|.konflux/controller/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-controller-pull-request.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-controller-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-controller-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-controller-on-pull-request
namespace: rh-openshift-builds-tenant
Expand All @@ -29,7 +29,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-controller-1-1:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-controller-1-2:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand Down Expand Up @@ -251,7 +251,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -280,7 +280,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -304,7 +304,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-controller-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('version/|pkg/controller/|pkg/client|pkg/reconciler|pkg/volumes|pkg/validate|pkg/env|pkg/metrics/|pkg/apis/|pkg/config/|pkg/ctxlog/|cmd/shipwright-build-controller/|.konflux/controller/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-controller-push.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-controller-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-controller-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-controller-on-push
namespace: rh-openshift-builds-tenant
Expand All @@ -28,7 +28,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-controller-1-1:{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-controller-1-2:{{revision}}
- name: dockerfile
value: .konflux/controller/Dockerfile
- name: build-source-image
Expand Down Expand Up @@ -248,7 +248,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -277,7 +277,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -301,7 +301,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-git-cloner-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('cmd/git/|pkg/git/|.konflux/git-cloner/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-git-cloner-pull-request.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-git-cloner-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-git-cloner-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-git-cloner-on-pull-request
namespace: rh-openshift-builds-tenant
Expand All @@ -29,7 +29,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-git-cloner-1-1:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-git-cloner-1-2:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand Down Expand Up @@ -257,7 +257,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -286,7 +286,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -310,7 +310,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-git-cloner-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('cmd/git/|pkg/git/|.konflux/git-cloner/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-git-cloner-push.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-git-cloner-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-git-cloner-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-git-cloner-on-push
namespace: rh-openshift-builds-tenant
Expand All @@ -28,7 +28,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-git-cloner-1-1:{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-git-cloner-1-2:{{revision}}
- name: dockerfile
value: .konflux/git-cloner/Dockerfile
- name: build-source-image
Expand Down Expand Up @@ -254,7 +254,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -283,7 +283,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -307,7 +307,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-image-bundler-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('cmd/bundle/|pkg/bundle/|pkg/image/|.konflux/image-bundler/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-image-bundler-pull-request.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-image-bundler-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-image-bundler-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-image-bundler-on-pull-request
namespace: rh-openshift-builds-tenant
Expand All @@ -29,7 +29,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-image-bundler-1-1:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-image-bundler-1-2:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand Down Expand Up @@ -251,7 +251,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -280,7 +280,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -304,7 +304,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
14 changes: 7 additions & 7 deletions .tekton/openshift-builds-image-bundler-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: |
event == "push" &&
target_branch == "builds-1.1" &&
target_branch == "builds-1.2" &&
(
files.all.exists(x, x.matches('cmd/bundle/|pkg/bundle/|pkg/image/|.konflux/image-bundler/')) ||
files.all.exists(x, x.matches('go.mod|go.sum')) ||
files.all.exists(x, x.matches('.tekton/openshift-builds-image-bundler-push.yaml'))
)
creationTimestamp: null
labels:
appstudio.openshift.io/application: openshift-builds-1-1
appstudio.openshift.io/component: openshift-builds-image-bundler-1-1
appstudio.openshift.io/application: openshift-builds-1-2
appstudio.openshift.io/component: openshift-builds-image-bundler-1-2
pipelines.appstudio.openshift.io/type: build
name: openshift-builds-image-bundler-on-push
namespace: rh-openshift-builds-tenant
Expand All @@ -28,7 +28,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-image-bundler-1-1:{{revision}}
value: quay.io/redhat-user-workloads/rh-openshift-builds-tenant/openshift-builds-image-bundler-1-2:{{revision}}
- name: dockerfile
value: .konflux/image-bundler/Dockerfile
- name: build-source-image
Expand Down Expand Up @@ -248,7 +248,7 @@ spec:
- name: name
value: buildah-remote-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:7fd79c7d4c722e4355b5e0546fc84c1cbd2a9ebb23b16f1a4b2e0b03ec7919fc
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:0701fda689f7a8aa723aaffb4527e15782598f4268a6b505225d2a38db9897cf
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -277,7 +277,7 @@ spec:
- name: name
value: build-image-index
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:715fa1fd7a8ebe0da552730e564eef340717b6346f1690ebe06685a252fe88bc
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:5da8c2f09990b801f1fd02a0ab3c4136845661e53c98e8a7ebf720774e064fac
- name: kind
value: task
resolver: bundles
Expand All @@ -301,7 +301,7 @@ spec:
- name: name
value: source-build-oci-ta
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:0027609e974a9f8ea9ae85634bda931d1e18de52d8c3c2e41de3950391f470ab
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:178298b5c8bbc2f8fa91ef94aca57a5a2dcb3834c71c8835bae51a20fe30e4e7
- name: kind
value: task
resolver: bundles
Expand Down
Loading

0 comments on commit a253621

Please sign in to comment.