diff --git a/.gitmodules b/.gitmodules index 14c9f84cb5d..499bc204d24 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/.tekton/images-mirror-set.yaml b/.tekton/images-mirror-set.yaml index 18e826a38a1..acb94afebea 100644 --- a/.tekton/images-mirror-set.yaml +++ b/.tekton/images-mirror-set.yaml @@ -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 @@ -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 diff --git a/.tekton/osc-daemonset-pull-request.yaml b/.tekton/osc-daemonset-pull-request.yaml index ee52d54bdce..8107f7a3947 100644 --- a/.tekton/osc-daemonset-pull-request.yaml +++ b/.tekton/osc-daemonset-pull-request.yaml @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-daemonset-push.yaml b/.tekton/osc-daemonset-push.yaml index ec079007fdf..5a6915e8489 100644 --- a/.tekton/osc-daemonset-push.yaml +++ b/.tekton/osc-daemonset-push.yaml @@ -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: @@ -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: diff --git a/.tekton/osc-must-gather-pull-request.yaml b/.tekton/osc-must-gather-pull-request.yaml index 6360ff160e7..1cf24fe741b 100644 --- a/.tekton/osc-must-gather-pull-request.yaml +++ b/.tekton/osc-must-gather-pull-request.yaml @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-must-gather-push.yaml b/.tekton/osc-must-gather-push.yaml index 06bb0884373..a09cdcfdffa 100644 --- a/.tekton/osc-must-gather-push.yaml +++ b/.tekton/osc-must-gather-push.yaml @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-operator-bundle-pull-request.yaml b/.tekton/osc-operator-bundle-pull-request.yaml index 97ddac3163e..ccfa360a2f8 100644 --- a/.tekton/osc-operator-bundle-pull-request.yaml +++ b/.tekton/osc-operator-bundle-pull-request.yaml @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-operator-bundle-push.yaml b/.tekton/osc-operator-bundle-push.yaml index dbc9fe4721c..e9b029e390f 100644 --- a/.tekton/osc-operator-bundle-push.yaml +++ b/.tekton/osc-operator-bundle-push.yaml @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-operator-pull-request.yaml b/.tekton/osc-operator-pull-request.yaml index df2e306fdd3..f5f86e7feef 100644 --- a/.tekton/osc-operator-pull-request.yaml +++ b/.tekton/osc-operator-pull-request.yaml @@ -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$')) && @@ -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: @@ -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 @@ -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: diff --git a/.tekton/osc-operator-push.yaml b/.tekton/osc-operator-push.yaml index 16975b68412..b611b1b2cf0 100644 --- a/.tekton/osc-operator-push.yaml +++ b/.tekton/osc-operator-push.yaml @@ -9,7 +9,7 @@ metadata: pipelinesascode.tekton.dev/max-keep-runs: '3' pipelinesascode.tekton.dev/on-cel-expression: | event == "push" && - 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$')) && @@ -18,10 +18,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-push + name: osc-operator-v1-14-on-push namespace: ose-osc-tenant spec: params: @@ -30,7 +30,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator:{{revision}} + value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-operator-v1-14:{{revision}} - name: dockerfile value: Dockerfile - name: prefetch-input @@ -40,7 +40,7 @@ spec: pipelineRef: name: build-pipeline taskRunTemplate: - serviceAccountName: build-pipeline-osc-operator + serviceAccountName: build-pipeline-osc-operator-v1-14 workspaces: - name: git-auth secret: diff --git a/.tekton/osc-podvm-builder-pull-request.yaml b/.tekton/osc-podvm-builder-pull-request.yaml index a28f13cba68..7d2ca3653aa 100644 --- a/.tekton/osc-podvm-builder-pull-request.yaml +++ b/.tekton/osc-podvm-builder-pull-request.yaml @@ -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" && ( "config/peerpods/podvm/***".pathChanged() || ".tekton/osc-podvm-builder-pull-request.yaml".pathChanged() || ".tekton/build-pipeline.yaml".pathChanged() ) creationTimestamp: labels: - appstudio.openshift.io/application: openshift-sandboxed-containers - appstudio.openshift.io/component: osc-podvm-builder + appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14 + appstudio.openshift.io/component: osc-podvm-builder-v1-14 pipelines.appstudio.openshift.io/type: build - name: osc-podvm-builder-on-pull-request + name: osc-podvm-builder-v1-14-on-pull-request namespace: ose-osc-tenant spec: params: @@ -28,7 +28,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder:on-pr-{{revision}} + value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-14:on-pr-{{revision}} - name: image-expires-after value: 5d - name: dockerfile @@ -53,7 +53,7 @@ spec: pipelineRef: name: build-pipeline taskRunTemplate: - serviceAccountName: build-pipeline-osc-podvm-builder + serviceAccountName: build-pipeline-osc-podvm-builder-v1-14 workspaces: - name: git-auth secret: diff --git a/.tekton/osc-podvm-builder-push.yaml b/.tekton/osc-podvm-builder-push.yaml index e4c70d7efb1..dd74fc53a61 100644 --- a/.tekton/osc-podvm-builder-push.yaml +++ b/.tekton/osc-podvm-builder-push.yaml @@ -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" && ( "config/peerpods/podvm/***".pathChanged() || ".tekton/osc-podvm-builder-push.yaml".pathChanged() || ".tekton/build-pipeline.yaml".pathChanged() ) creationTimestamp: labels: - appstudio.openshift.io/application: openshift-sandboxed-containers - appstudio.openshift.io/component: osc-podvm-builder + appstudio.openshift.io/application: openshift-sandboxed-containers-v1-14 + appstudio.openshift.io/component: osc-podvm-builder-v1-14 pipelines.appstudio.openshift.io/type: build - name: osc-podvm-builder-on-push + name: osc-podvm-builder-v1-14-on-push namespace: ose-osc-tenant spec: params: @@ -27,7 +27,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder:{{revision}} + value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-podvm-builder-v1-14:{{revision}} - name: dockerfile value: Dockerfile.podvm-builder - name: path-context @@ -46,7 +46,7 @@ spec: pipelineRef: name: build-pipeline taskRunTemplate: - serviceAccountName: build-pipeline-osc-podvm-builder + serviceAccountName: build-pipeline-osc-podvm-builder-v1-14 workspaces: - name: git-auth secret: diff --git a/.tekton/osc-test-fbc-pull-request.yaml b/.tekton/osc-test-fbc-pull-request.yaml index 28e88806eac..425db02f71e 100644 --- a/.tekton/osc-test-fbc-pull-request.yaml +++ b/.tekton/osc-test-fbc-pull-request.yaml @@ -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" && ( "fbc/test-fbc/***".pathChanged() || "fbc/render.sh".pathChanged() || ".tekton/osc-test-fbc-pull-request.yaml".pathChanged() || "tests/osc-test-fbc-integration.yaml".pathChanged() ) + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "osc-release-v1.14" && ( "fbc/test-fbc/***".pathChanged() || "fbc/render.sh".pathChanged() || ".tekton/osc-test-fbc-pull-request.yaml".pathChanged() || "tests/osc-test-fbc-integration.yaml".pathChanged() ) creationTimestamp: labels: - appstudio.openshift.io/application: osc-test-catalog - appstudio.openshift.io/component: osc-test-fbc + appstudio.openshift.io/application: osc-test-catalog-v1-14 + appstudio.openshift.io/component: osc-test-fbc-v1-14 pipelines.appstudio.openshift.io/type: build - name: osc-test-fbc-on-pull-request + name: osc-test-fbc-v1-14-on-pull-request namespace: ose-osc-tenant spec: params: @@ -23,7 +23,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-test-fbc:on-pr-{{revision}} + value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-test-fbc-v1-14:on-pr-{{revision}} - name: image-expires-after value: 5d - name: build-platforms @@ -399,7 +399,7 @@ spec: - name: netrc optional: true taskRunTemplate: - serviceAccountName: build-pipeline-osc-test-fbc + serviceAccountName: build-pipeline-osc-test-fbc-v1-14 workspaces: - name: git-auth secret: diff --git a/.tekton/osc-test-fbc-push.yaml b/.tekton/osc-test-fbc-push.yaml index 735c4004ed0..b04f629287d 100644 --- a/.tekton/osc-test-fbc-push.yaml +++ b/.tekton/osc-test-fbc-push.yaml @@ -7,13 +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 == "devel" && ( "fbc/test-fbc/***".pathChanged() || "fbc/render.sh".pathChanged() || ".tekton/osc-test-fbc-push.yaml".pathChanged() ) + pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "osc-release-v1.14" && ( "fbc/test-fbc/***".pathChanged() || "fbc/render.sh".pathChanged() || ".tekton/osc-test-fbc-push.yaml".pathChanged() ) creationTimestamp: labels: - appstudio.openshift.io/application: osc-test-catalog - appstudio.openshift.io/component: osc-test-fbc + appstudio.openshift.io/application: osc-test-catalog-v1-14 + appstudio.openshift.io/component: osc-test-fbc-v1-14 pipelines.appstudio.openshift.io/type: build - name: osc-test-fbc-on-push + name: osc-test-fbc-v1-14-on-push namespace: ose-osc-tenant spec: params: @@ -22,7 +22,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-test-fbc:{{revision}} + value: quay.io/redhat-user-workloads/ose-osc-tenant/osc-test-fbc-v1-14:{{revision}} - name: build-platforms value: - linux/x86_64 @@ -394,7 +394,7 @@ spec: - name: netrc optional: true taskRunTemplate: - serviceAccountName: build-pipeline-osc-test-fbc + serviceAccountName: build-pipeline-osc-test-fbc-v1-14 workspaces: - name: git-auth secret: diff --git a/config/peerpods/podvm/cloud-api-adaptor b/config/peerpods/podvm/cloud-api-adaptor index 29ba5145c2d..1de7da86dc5 160000 --- a/config/peerpods/podvm/cloud-api-adaptor +++ b/config/peerpods/podvm/cloud-api-adaptor @@ -1 +1 @@ -Subproject commit 29ba5145c2dc550d90162e04cb6ced9562f3182d +Subproject commit 1de7da86dc5e5c5feba2d014248b5c7df9f618c2 diff --git a/tests/build-test-artifacts.yaml b/tests/build-test-artifacts.yaml index ded37c12a04..d48ea9b24d0 100644 --- a/tests/build-test-artifacts.yaml +++ b/tests/build-test-artifacts.yaml @@ -118,7 +118,7 @@ spec: # components that live in this repo — the PR-rebuilt ones # share the PR HEAD commit while stale ones each point to # different devel merge commits. - OSC_REPO_COMPONENTS='["osc-operator","osc-operator-bundle","osc-daemonset","osc-must-gather","osc-podvm-builder"]' + OSC_REPO_COMPONENTS='["osc-operator-v1-14","osc-operator-bundle-v1-14","osc-daemonset-v1-14","osc-must-gather-v1-14","osc-podvm-builder-v1-14"]' srcURL=$(jq -r --argjson comps "$OSC_REPO_COMPONENTS" \ '[.components[] | select(.name as $n | $comps | index($n)) | .source.git.url // empty] | first' \ <<< "${SNAPSHOT}") diff --git a/tests/make-test.yaml b/tests/make-test.yaml index b7dec9653be..1a3aaf904bc 100644 --- a/tests/make-test.yaml +++ b/tests/make-test.yaml @@ -40,8 +40,8 @@ spec: WARNINGS=0 dnf -y install jq git make go - srcURL=$(jq -r '.components[] | select(.name=="osc-operator") | .source.git.url' <<< "${SNAPSHOT}") - srcREV=$(jq -r '.components[] | select(.name=="osc-operator") | .source.git.revision' <<< "${SNAPSHOT}") + srcURL=$(jq -r '.components[] | select(.name=="osc-operator-v1-14") | .source.git.url' <<< "${SNAPSHOT}") + srcREV=$(jq -r '.components[] | select(.name=="osc-operator-v1-14") | .source.git.revision' <<< "${SNAPSHOT}") git clone ${srcURL} sources cd sources