diff --git a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml b/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml index de35ebdd4b8ef..2fba1dbab25fd 100644 --- a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml +++ b/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml @@ -58,6 +58,35 @@ tests: requests: cpu: 100m memory: 200Mi +- as: cluster-api-provider-openstack-4-19 + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-openstack-4-19 + commands: | + merge-bot --source https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 \ + --dest openshift/cluster-api-provider-openstack:release-4.19 \ + --merge shiftstack/cluster-api-provider-openstack:merge-bot-release-4.19 \ + --update-go-modules \ + --run-make \ + --bot-name shiftstack-merge-bot --bot-email shiftstack-merge-bot@redhat.com \ + --github-app-key /secrets/merge-bot/github_private_key \ + --github-cloner-key /secrets/merge-bot/github_cloner_private_key \ + --slack-webhook /secrets/slack-hooks/forum-shiftstack + credentials: + - mount_path: /secrets/merge-bot + name: shiftstack-merge-bot + namespace: test-credentials + - mount_path: /secrets/slack-hooks + name: shiftstack-slack-hooks + namespace: test-credentials + from: merge-bot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi - as: cluster-api-provider-openstack-4-18 cron: 0 12 * * Mon,Thu steps: @@ -201,6 +230,34 @@ tests: requests: cpu: 100m memory: 200Mi +- as: cloud-provider-openstack-4-19 + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cloud-provider-openstack-4-19 + commands: | + merge-bot --source https://github.com/kubernetes/cloud-provider-openstack:release-1.31 \ + --dest openshift/cloud-provider-openstack:release-4.19 \ + --merge shiftstack/cloud-provider-openstack:merge-bot-release-4.19 \ + --update-go-modules \ + --bot-name shiftstack-merge-bot --bot-email shiftstack-merge-bot@redhat.com \ + --github-app-key /secrets/merge-bot/github_private_key \ + --github-cloner-key /secrets/merge-bot/github_cloner_private_key \ + --slack-webhook /secrets/slack-hooks/forum-shiftstack + credentials: + - mount_path: /secrets/merge-bot + name: shiftstack-merge-bot + namespace: test-credentials + - mount_path: /secrets/slack-hooks + name: shiftstack-slack-hooks + namespace: test-credentials + from: merge-bot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi - as: cloud-provider-openstack-4-18 cron: 0 12 * * Mon,Thu steps: diff --git a/ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml b/ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml index ea15588fb5fd5..72029151db2cd 100644 --- a/ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml +++ b/ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml @@ -370,6 +370,59 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build07 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: shiftstack + repo: merge-bot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-shiftstack-merge-bot-main-cloud-provider-openstack-4-19 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=cloud-provider-openstack-4-19 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build07 cron: 0 12 * * Mon,Thu @@ -635,6 +688,59 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build07 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: shiftstack + repo: merge-bot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-shiftstack-merge-bot-main-cluster-api-provider-openstack-4-19 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=cluster-api-provider-openstack-4-19 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build07 cron: 0 12 * * Mon,Thu