Skip to content

OpenStack: Bump merge-bot config for openstack repos #65267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] \
--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:
Expand Down Expand Up @@ -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 [email protected] \
--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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down