diff --git a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml index 3ca13ffa9f120..74a2ffc8f8fa8 100644 --- a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml +++ b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml @@ -39,7 +39,7 @@ tests: commands: | rebasebot --source https://github.com/kubernetes/cloud-provider-aws:master \ --dest openshift/cloud-provider-aws:main \ - --rebase openshift-cloud-team/cloud-provider-aws:rebase-bot-master \ + --rebase openshift-cloud-team/cloud-provider-aws:rebase-bot-main \ --update-go-modules \ --slack-webhook /secrets/rebasebot/slack-webhook \ --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ @@ -59,6 +59,186 @@ tests: requests: cpu: 100m memory: 200Mi +- as: cluster-api-provider-azure + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-azure + commands: | + rebasebot --source-repo kubernetes-sigs/cluster-api-provider-azure \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api-provider-azure:master \ + --rebase openshift-cloud-team/cluster-api-provider-azure:rebase-bot-master \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +- as: cluster-api-provider-aws + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-aws + commands: | + rebasebot --source-repo kubernetes-sigs/cluster-api-provider-aws \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api-provider-aws:master \ + --rebase openshift-cloud-team/cluster-api-provider-aws:rebase-bot-master \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +- as: cluster-api-provider-gcp + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-gcp + commands: | + rebasebot --source kubernetes-sigs/cluster-api-provider-gcp \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api-provider-gcp:master \ + --rebase openshift-cloud-team/cluster-api-provider-gcp:rebase-bot-master \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +- as: cluster-api-provider-vsphere + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-vsphere + commands: | + rebasebot --source-repo kubernetes-sigs/cluster-api-provider-vsphere \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api-provider-vsphere:master \ + --rebase openshift-cloud-team/cluster-api-provider-vsphere:rebase-bot-master \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +- as: cluster-api-provider-ibmcloud + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api-provider-ibmcloud + commands: | + rebasebot --source-repo kubernetes-sigs/cluster-api-provider-ibmcloud \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api-provider-ibmcloud:main \ + --rebase openshift-cloud-team/cluster-api-provider-ibmcloud:rebase-bot-main \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +- as: cluster-api + cron: 0 12 * * Mon,Thu + steps: + test: + - as: cluster-api + commands: | + rebasebot --source-repo kubernetes-sigs/cluster-api \ + --source-ref-hook _BUILTIN_/source-ref-hooks/latest-stable-release.sh \ + --dest openshift/cluster-api:master \ + --rebase openshift-cloud-team/cluster-api:rebase-bot-master \ + --update-go-modules \ + --post-rebase-hook git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/update-ocp-manifests-gen.sh git:https://github.com/openshift/cluster-capi-operator/main:hack/rebasebot-hook-scripts/generate-ocp-manifests.sh \ + --slack-webhook /secrets/rebasebot/slack-webhook \ + --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ + --github-cloner-key /secrets/rebasebot/cloud-team-bot-key \ + --git-username cloud-team-rebase-bot \ + --git-email cloud-team-rebase-bot@redhat.com \ + --bot-emails cloud-team-rebase-bot@redhat.com openshift-bot@redhat.com openshift-ci-robot@redhat.com \ + --tag-policy=strict + credentials: + - mount_path: /secrets/rebasebot + name: rebase-bot-creds + namespace: test-credentials + from: rebasebot + resources: + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi - as: cloud-provider-ibm cron: 10 12 * * Mon,Thu steps: @@ -68,7 +248,7 @@ tests: export BRANCH_NAME=$(curl --silent --header "X-GitHub-Api-Version:2022-11-28" "https://api.github.com/repos/IBM-Cloud/cloud-provider-ibm/branches" | grep -E '"name": "release-[0-9]+\.[0-9]+"' | awk -F'"' '{print $4}' | sort -V | tail -n 1) rebasebot --source https://github.com/IBM-Cloud/cloud-provider-ibm:${BRANCH_NAME} \ --dest openshift/cloud-provider-ibm:main \ - --rebase openshift-cloud-team/cloud-provider-ibm:rebase-bot-master \ + --rebase openshift-cloud-team/cloud-provider-ibm:rebase-bot-main \ --update-go-modules \ --slack-webhook /secrets/rebasebot/slack-webhook \ --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ @@ -153,7 +333,7 @@ tests: commands: | rebasebot --source https://github.com/kubernetes-sigs/cloud-provider-azure:master \ --dest openshift/cloud-provider-azure:main \ - --rebase openshift-cloud-team/cloud-provider-azure:rebase-bot-master \ + --rebase openshift-cloud-team/cloud-provider-azure:rebase-bot-main \ --update-go-modules \ --slack-webhook /secrets/rebasebot/slack-webhook \ --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ @@ -181,7 +361,7 @@ tests: commands: | rebasebot --source https://github.com/kubernetes/cloud-provider-gcp:master \ --dest openshift/cloud-provider-gcp:main \ - --rebase openshift-cloud-team/cloud-provider-gcp:rebase-bot-master \ + --rebase openshift-cloud-team/cloud-provider-gcp:rebase-bot-main \ --update-go-modules \ --slack-webhook /secrets/rebasebot/slack-webhook \ --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ @@ -209,7 +389,7 @@ tests: commands: | rebasebot --source https://github.com/kubernetes/cloud-provider-vsphere:master \ --dest openshift/cloud-provider-vsphere:main \ - --rebase openshift-cloud-team/cloud-provider-vsphere:rebase-bot-master \ + --rebase openshift-cloud-team/cloud-provider-vsphere:rebase-bot-main \ --update-go-modules \ --slack-webhook /secrets/rebasebot/slack-webhook \ --github-app-key /secrets/rebasebot/cloud-team-openshift-bot-key \ diff --git a/ci-operator/jobs/openshift-eng/rebasebot/openshift-eng-rebasebot-main-periodics.yaml b/ci-operator/jobs/openshift-eng/rebasebot/openshift-eng-rebasebot-main-periodics.yaml index a13020101cfbc..eb0ebdf195ff5 100644 --- a/ci-operator/jobs/openshift-eng/rebasebot/openshift-eng-rebasebot-main-periodics.yaml +++ b/ci-operator/jobs/openshift-eng/rebasebot/openshift-eng-rebasebot-main-periodics.yaml @@ -423,6 +423,324 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build09 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api + 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 + 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: build09 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-aws + 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-aws + 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: build09 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-azure + 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-azure + 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: build09 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-gcp + 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-gcp + 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: build09 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-ibmcloud + 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-ibmcloud + 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: vsphere02 + cron: 0 12 * * Mon,Thu + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-eng + repo: rebasebot + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-eng-rebasebot-main-cluster-api-provider-vsphere + 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-vsphere + 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: build09 cron: 0 23 * * 1-5