Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "config/peerpods/podvm/cloud-api-adaptor"]
path = config/peerpods/podvm/cloud-api-adaptor
url = https://github.com/openshift/cloud-api-adaptor/
branch = osc-release
branch = osc-release-v1.14
22 changes: 22 additions & 0 deletions .tekton/images-mirror-set.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,56 @@ spec:
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-operator-bundle
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-daemonset-rhel9
---
apiVersion: config.openshift.io/v1
Expand All @@ -57,43 +68,54 @@ spec:
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-monitor-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-monitor-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-caa-webhook-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-cloud-api-adaptor-webhook-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-payload-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel9
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-operator-bundle
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-dm-verity-image-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-dm-verity-image
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper-v1-13
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-storage-helper-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-storage-helper
- mirrors:
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset
- quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset-v1-14
source: registry.redhat.io/openshift-sandboxed-containers/osc-daemonset-rhel9
12 changes: 6 additions & 6 deletions .tekton/osc-daemonset-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ metadata:
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
== "devel" && ( "scripts/kata-install/***".pathChanged() || ".tekton/osc-daemonset-pull-request.yaml".pathChanged()
== "osc-release-v1.14" && ( "scripts/kata-install/***".pathChanged() || ".tekton/osc-daemonset-pull-request.yaml".pathChanged()
|| ".tekton/build-pipeline.yaml".pathChanged() )
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-daemonset
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-daemonset-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-daemonset-on-pull-request
name: osc-daemonset-v1-14-on-pull-request
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -24,7 +24,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-daemonset-v1-14:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand All @@ -42,7 +42,7 @@ spec:
pipelineRef:
name: build-pipeline
taskRunTemplate:
serviceAccountName: build-pipeline-osc-daemonset
serviceAccountName: build-pipeline-osc-daemonset-v1-14
workspaces:
- name: git-auth
secret:
Expand Down
10 changes: 5 additions & 5 deletions .tekton/osc-daemonset-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "devel" && ( "scripts/kata-install/***".pathChanged() || ".tekton/osc-daemonset-push.yaml".pathChanged()
== "osc-release-v1.14" && ( "scripts/kata-install/***".pathChanged() || ".tekton/osc-daemonset-push.yaml".pathChanged()
|| ".tekton/build-pipeline.yaml".pathChanged() )
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-daemonset
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-daemonset-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-daemonset-on-push
name: osc-daemonset-v1-14-on-push
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -35,7 +35,7 @@ spec:
pipelineRef:
name: build-pipeline
taskRunTemplate:
serviceAccountName: build-pipeline-osc-daemonset
serviceAccountName: build-pipeline-osc-daemonset-v1-14
workspaces:
- name: git-auth
secret:
Expand Down
12 changes: 6 additions & 6 deletions .tekton/osc-must-gather-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ metadata:
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 == "devel" &&
target_branch == "osc-release-v1.14" &&
( "must-gather/***".pathChanged() ||
".tekton/osc-must-gather-pull-request.yaml".pathChanged() ||
".tekton/build-pipeline.yaml".pathChanged()
)
creationTimestamp:
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-must-gather
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-must-gather-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-must-gather-on-pull-request
name: osc-must-gather-v1-14-on-pull-request
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -28,7 +28,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-14:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand All @@ -46,7 +46,7 @@ spec:
pipelineRef:
name: build-pipeline
taskRunTemplate:
serviceAccountName: build-pipeline-osc-must-gather
serviceAccountName: build-pipeline-osc-must-gather-v1-14
workspaces:
- name: git-auth
secret:
Expand Down
12 changes: 6 additions & 6 deletions .tekton/osc-must-gather-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: 'false'
pipelinesascode.tekton.dev/max-keep-runs: '3'
pipelinesascode.tekton.dev/on-cel-expression: event == "push" &&
target_branch == "devel" &&
target_branch == "osc-release-v1.14" &&
( "must-gather/***".pathChanged() ||
".tekton/osc-must-gather-push.yaml".pathChanged() ||
".tekton/build-pipeline.yaml".pathChanged()
)
creationTimestamp:
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-must-gather
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-must-gather-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-must-gather-on-push
name: osc-must-gather-v1-14-on-push
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -27,7 +27,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather:{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-must-gather-v1-14:{{revision}}
- name: dockerfile
value: Dockerfile
- name: path-context
Expand All @@ -39,7 +39,7 @@ spec:
pipelineRef:
name: build-pipeline
taskRunTemplate:
serviceAccountName: build-pipeline-osc-must-gather
serviceAccountName: build-pipeline-osc-must-gather-v1-14
workspaces:
- name: git-auth
secret:
Expand Down
12 changes: 6 additions & 6 deletions .tekton/osc-operator-bundle-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ metadata:
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 == "devel" && files.all.exists(path, path.matches('bundle*|.tekton/*bundle*'))
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "osc-release-v1.14" && files.all.exists(path, path.matches('bundle*|.tekton/*bundle*'))
creationTimestamp:
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-operator-bundle
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-operator-bundle-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-operator-bundle-on-pull-request
name: osc-operator-bundle-v1-14-on-pull-request
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-14:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand Down Expand Up @@ -585,7 +585,7 @@ spec:
- name: netrc
optional: true
taskRunTemplate:
serviceAccountName: build-pipeline-osc-operator-bundle
serviceAccountName: build-pipeline-osc-operator-bundle-v1-14
workspaces:
- name: workspace
volumeClaimTemplate:
Expand Down
12 changes: 6 additions & 6 deletions .tekton/osc-operator-bundle-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,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 == "devel" && files.all.exists(path, path.matches('bundle*|.tekton/*bundle*'))
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "osc-release-v1.14" && files.all.exists(path, path.matches('bundle*|.tekton/*bundle*'))
creationTimestamp:
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-operator-bundle
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-operator-bundle-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-operator-bundle-on-push
name: osc-operator-bundle-v1-14-on-push
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -23,7 +23,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle:{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-bundle-v1-14:{{revision}}
- name: dockerfile
value: bundle.Dockerfile
- name: build-args
Expand Down Expand Up @@ -579,7 +579,7 @@ spec:
- name: netrc
optional: true
taskRunTemplate:
serviceAccountName: build-pipeline-osc-operator-bundle
serviceAccountName: build-pipeline-osc-operator-bundle-v1-14
workspaces:
- name: workspace
volumeClaimTemplate:
Expand Down
12 changes: 6 additions & 6 deletions .tekton/osc-operator-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
pipelinesascode.tekton.dev/max-keep-runs: '3'
pipelinesascode.tekton.dev/on-cel-expression: |
event == "pull_request" &&
target_branch == "devel" &&
target_branch == "osc-release-v1.14" &&
files.all.exists(path, !path.matches('bundle/.*|.tekton/.*bundle.*yaml$|config/manager/.*')) &&
files.all.exists(path, !path.matches('must-gather/.*|.tekton/.*must-gather.*yaml$')) &&
files.all.exists(path, !path.matches('config/peerpods/podvm/.*|.tekton/.*podvm-builder.*yaml$')) &&
Expand All @@ -19,10 +19,10 @@ metadata:
files.all.exists(path, !path.matches('.tekton/.*fbc-.*|fbc/.*'))
creationTimestamp:
labels:
appstudio.openshift.io/application: openshift-sandboxed-containers
appstudio.openshift.io/component: osc-operator
appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14
appstudio.openshift.io/component: osc-operator-v1-14
pipelines.appstudio.openshift.io/type: build
name: osc-operator-on-pull-request
name: osc-operator-v1-14-on-pull-request
namespace: ose-osc-tenant
spec:
params:
Expand All @@ -31,7 +31,7 @@ spec:
- name: revision
value: '{{revision}}'
- name: output-image
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-14:on-pr-{{revision}}
- name: image-expires-after
value: 5d
- name: dockerfile
Expand All @@ -47,7 +47,7 @@ spec:
pipelineRef:
name: build-pipeline
taskRunTemplate:
serviceAccountName: build-pipeline-osc-operator
serviceAccountName: build-pipeline-osc-operator-v1-14
workspaces:
- name: git-auth
secret:
Expand Down
Loading