shiftstack/merge-bot: Sync release-4.21 branches (openshift#73863)

CPO doesn't have a release-1.35 branch cut yet, so we'll need to come
back and do this later.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml

@@ -35,7 +35,7 @@ tests:
     test:
     - as: cluster-api-provider-openstack-main
       commands: |
-        merge-bot --source https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.13 \
+        merge-bot --source https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.14 \
                   --dest openshift/cluster-api-provider-openstack:main \
                   --merge shiftstack/cluster-api-provider-openstack:merge-bot-main \
                   --update-go-modules \
@@ -61,6 +61,38 @@ tests:
         requests:
           cpu: 100m
           memory: 200Mi
+- as: cluster-api-provider-openstack-4-21
+  cron: 0 12 * * Mon,Thu
+  steps:
+    test:
+    - as: cluster-api-provider-openstack-4-21
+      commands: |
+        merge-bot --source https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.13 \
+                  --dest openshift/cluster-api-provider-openstack:release-4.21 \
+                  --merge shiftstack/cluster-api-provider-openstack:merge-bot-release-4.21 \
+                  --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:
+      - collection: ""
+        mount_path: /secrets/merge-bot
+        name: shiftstack-merge-bot
+        namespace: test-credentials
+      - collection: ""
+        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-20
   cron: 0 12 * * Mon,Thu
   steps:
@@ -252,6 +284,37 @@ tests:
         requests:
           cpu: 100m
           memory: 200Mi
+- as: cloud-provider-openstack-4-21
+  cron: 0 12 * * Mon,Thu
+  steps:
+    test:
+    - as: cloud-provider-openstack-4-21
+      commands: |
+        merge-bot --source https://github.com/kubernetes/cloud-provider-openstack:release-1.34 \
+                  --dest openshift/cloud-provider-openstack:release-4.21 \
+                  --merge shiftstack/cloud-provider-openstack:merge-bot-release-4.21 \
+                  --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:
+      - collection: ""
+        mount_path: /secrets/merge-bot
+        name: shiftstack-merge-bot
+        namespace: test-credentials
+      - collection: ""
+        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-20
   cron: 0 12 * * Mon,Thu
   steps:

ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml

@@ -264,6 +264,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-21
+  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-21
+      command:
+      - ci-operator
+      image: quay-proxy.ci.openshift.org/openshift/ci:ci_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
@@ -582,6 +635,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-21
+  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-21
+      command:
+      - ci-operator
+      image: quay-proxy.ci.openshift.org/openshift/ci:ci_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