Skip to content

Commit 2761a06

Browse files
Merge pull request openshift#58999 from openshift-bot/auto-config-brancher
Automate config brancher by auto-config-brancher job at Tue, 19 Nov 2024 20:11:36 UTC
2 parents 68ca6cd + 89c1591 commit 2761a06

21 files changed

+903
-1
lines changed

ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
dev-scripts:
3+
name: test
4+
namespace: ocp-kni
5+
tag: dev-scripts
26
ocp_4.18_base-rhel9:
37
name: 4.18-priv
48
namespace: ocp-private
@@ -170,6 +174,27 @@ tests:
170174
requests:
171175
cpu: 100m
172176
workflow: openshift-e2e-vsphere
177+
- as: e2e-metal3-capi-techpreview
178+
cluster: build05
179+
optional: true
180+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
181+
steps:
182+
cluster_profile: equinix-ocp-metal
183+
env:
184+
DEVSCRIPTS_CONFIG: |
185+
BMO_WATCH_ALL_NAMESPACES="true"
186+
NUM_EXTRA_WORKERS=1
187+
EXTRA_WORKERS_NAMESPACE=openshift-cluster-api
188+
FEATURE_SET=TechPreviewNoUpgrade
189+
ENABLE_CAPI_E2E="true"
190+
test:
191+
- as: test
192+
commands: make e2e
193+
from: src
194+
resources:
195+
requests:
196+
cpu: 100m
197+
workflow: baremetalds-e2e-ovn-ipv6
173198
- as: regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
174199
optional: true
175200
steps:

ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
dev-scripts:
3+
name: test
4+
namespace: ocp-kni
5+
tag: dev-scripts
26
ocp_4.18_base-rhel9:
37
name: 4.18-priv
48
namespace: ocp-private
@@ -171,6 +175,27 @@ tests:
171175
requests:
172176
cpu: 100m
173177
workflow: openshift-e2e-vsphere
178+
- as: e2e-metal3-capi-techpreview
179+
cluster: build05
180+
optional: true
181+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
182+
steps:
183+
cluster_profile: equinix-ocp-metal
184+
env:
185+
DEVSCRIPTS_CONFIG: |
186+
BMO_WATCH_ALL_NAMESPACES="true"
187+
NUM_EXTRA_WORKERS=1
188+
EXTRA_WORKERS_NAMESPACE=openshift-cluster-api
189+
FEATURE_SET=TechPreviewNoUpgrade
190+
ENABLE_CAPI_E2E="true"
191+
test:
192+
- as: test
193+
commands: make e2e
194+
from: src
195+
resources:
196+
requests:
197+
cpu: 100m
198+
workflow: baremetalds-e2e-ovn-ipv6
174199
- as: regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
175200
optional: true
176201
steps:

ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.19.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
dev-scripts:
3+
name: test
4+
namespace: ocp-kni
5+
tag: dev-scripts
26
ocp_4.18_base-rhel9:
37
name: 4.19-priv
48
namespace: ocp-private
@@ -170,6 +174,27 @@ tests:
170174
requests:
171175
cpu: 100m
172176
workflow: openshift-e2e-vsphere
177+
- as: e2e-metal3-capi-techpreview
178+
cluster: build05
179+
optional: true
180+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
181+
steps:
182+
cluster_profile: equinix-ocp-metal
183+
env:
184+
DEVSCRIPTS_CONFIG: |
185+
BMO_WATCH_ALL_NAMESPACES="true"
186+
NUM_EXTRA_WORKERS=1
187+
EXTRA_WORKERS_NAMESPACE=openshift-cluster-api
188+
FEATURE_SET=TechPreviewNoUpgrade
189+
ENABLE_CAPI_E2E="true"
190+
test:
191+
- as: test
192+
commands: make e2e
193+
from: src
194+
resources:
195+
requests:
196+
cpu: 100m
197+
workflow: baremetalds-e2e-ovn-ipv6
173198
- as: regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
174199
optional: true
175200
steps:

ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,16 @@ tests:
476476
FEATURE_SET: TechPreviewNoUpgrade
477477
workflow: openshift-e2e-gcp
478478
timeout: 6h0m0s
479+
- always_run: false
480+
as: e2e-gcp-user-provisioned-dns
481+
optional: true
482+
steps:
483+
cluster_profile: gcp
484+
env:
485+
FEATURE_SET: TechPreviewNoUpgrade
486+
USER_PROVISIONED_DNS: "yes"
487+
workflow: openshift-e2e-gcp
488+
timeout: 6h0m0s
479489
- as: e2e-gcp-secureboot
480490
optional: true
481491
run_if_changed: (gcp|google)

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,16 @@ tests:
477477
FEATURE_SET: TechPreviewNoUpgrade
478478
workflow: openshift-e2e-gcp
479479
timeout: 6h0m0s
480+
- always_run: false
481+
as: e2e-gcp-user-provisioned-dns
482+
optional: true
483+
steps:
484+
cluster_profile: gcp
485+
env:
486+
FEATURE_SET: TechPreviewNoUpgrade
487+
USER_PROVISIONED_DNS: "yes"
488+
workflow: openshift-e2e-gcp
489+
timeout: 6h0m0s
480490
- as: e2e-gcp-secureboot
481491
optional: true
482492
run_if_changed: (gcp|google)

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,16 @@ tests:
476476
FEATURE_SET: TechPreviewNoUpgrade
477477
workflow: openshift-e2e-gcp
478478
timeout: 6h0m0s
479+
- always_run: false
480+
as: e2e-gcp-user-provisioned-dns
481+
optional: true
482+
steps:
483+
cluster_profile: gcp
484+
env:
485+
FEATURE_SET: TechPreviewNoUpgrade
486+
USER_PROVISIONED_DNS: "yes"
487+
workflow: openshift-e2e-gcp
488+
timeout: 6h0m0s
479489
- as: e2e-gcp-secureboot
480490
optional: true
481491
run_if_changed: (gcp|google)

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
dev-scripts:
3+
name: test
4+
namespace: ocp-kni
5+
tag: dev-scripts
26
ocp_4.18_base-rhel9:
37
name: "4.18"
48
namespace: ocp
@@ -170,6 +174,27 @@ tests:
170174
requests:
171175
cpu: 100m
172176
workflow: openshift-e2e-vsphere
177+
- as: e2e-metal3-capi-techpreview
178+
cluster: build05
179+
optional: true
180+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
181+
steps:
182+
cluster_profile: equinix-ocp-metal
183+
env:
184+
DEVSCRIPTS_CONFIG: |
185+
BMO_WATCH_ALL_NAMESPACES="true"
186+
NUM_EXTRA_WORKERS=1
187+
EXTRA_WORKERS_NAMESPACE=openshift-cluster-api
188+
FEATURE_SET=TechPreviewNoUpgrade
189+
ENABLE_CAPI_E2E="true"
190+
test:
191+
- as: test
192+
commands: make e2e
193+
from: src
194+
resources:
195+
requests:
196+
cpu: 100m
197+
workflow: baremetalds-e2e-ovn-ipv6
173198
- as: regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
174199
optional: true
175200
steps:

ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.19.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
base_images:
2+
dev-scripts:
3+
name: test
4+
namespace: ocp-kni
5+
tag: dev-scripts
26
ocp_4.18_base-rhel9:
37
name: "4.19"
48
namespace: ocp
@@ -169,6 +173,27 @@ tests:
169173
requests:
170174
cpu: 100m
171175
workflow: openshift-e2e-vsphere
176+
- as: e2e-metal3-capi-techpreview
177+
cluster: build05
178+
optional: true
179+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
180+
steps:
181+
cluster_profile: equinix-ocp-metal
182+
env:
183+
DEVSCRIPTS_CONFIG: |
184+
BMO_WATCH_ALL_NAMESPACES="true"
185+
NUM_EXTRA_WORKERS=1
186+
EXTRA_WORKERS_NAMESPACE=openshift-cluster-api
187+
FEATURE_SET=TechPreviewNoUpgrade
188+
ENABLE_CAPI_E2E="true"
189+
test:
190+
- as: test
191+
commands: make e2e
192+
from: src
193+
resources:
194+
requests:
195+
cpu: 100m
196+
workflow: baremetalds-e2e-ovn-ipv6
172197
- as: regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
173198
optional: true
174199
steps:

ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,16 @@ tests:
475475
FEATURE_SET: TechPreviewNoUpgrade
476476
workflow: openshift-e2e-gcp
477477
timeout: 6h0m0s
478+
- always_run: false
479+
as: e2e-gcp-user-provisioned-dns
480+
optional: true
481+
steps:
482+
cluster_profile: gcp
483+
env:
484+
FEATURE_SET: TechPreviewNoUpgrade
485+
USER_PROVISIONED_DNS: "yes"
486+
workflow: openshift-e2e-gcp
487+
timeout: 6h0m0s
478488
- as: e2e-gcp-secureboot
479489
optional: true
480490
run_if_changed: (gcp|google)

ci-operator/jobs/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main-presubmits.yaml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,91 @@ presubmits:
727727
secret:
728728
secretName: result-aggregator
729729
trigger: (?m)^/test( | .* )e2e-gcp-ovn-techpreview,?($|\s.*)
730+
- agent: kubernetes
731+
always_run: false
732+
branches:
733+
- ^main$
734+
- ^main-
735+
cluster: build05
736+
context: ci/prow/e2e-metal3-capi-techpreview
737+
decorate: true
738+
decoration_config:
739+
oauth_token_secret:
740+
key: oauth
741+
name: github-credentials-openshift-ci-robot-private-git-cloner
742+
hidden: true
743+
labels:
744+
ci-operator.openshift.io/cloud: equinix-ocp-metal
745+
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
746+
ci-operator.openshift.io/cluster: build05
747+
ci.openshift.io/generator: prowgen
748+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
749+
name: pull-ci-openshift-priv-cluster-capi-operator-main-e2e-metal3-capi-techpreview
750+
optional: true
751+
path_alias: github.com/openshift/cluster-capi-operator
752+
rerun_command: /test e2e-metal3-capi-techpreview
753+
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
754+
spec:
755+
containers:
756+
- args:
757+
- --gcs-upload-secret=/secrets/gcs/service-account.json
758+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
759+
- --lease-server-credentials-file=/etc/boskos/credentials
760+
- --oauth-token-path=/usr/local/github-credentials/oauth
761+
- --report-credentials-file=/etc/report/credentials
762+
- --secret-dir=/secrets/ci-pull-credentials
763+
- --target=e2e-metal3-capi-techpreview
764+
command:
765+
- ci-operator
766+
image: ci-operator:latest
767+
imagePullPolicy: Always
768+
name: ""
769+
resources:
770+
requests:
771+
cpu: 10m
772+
volumeMounts:
773+
- mountPath: /etc/boskos
774+
name: boskos
775+
readOnly: true
776+
- mountPath: /secrets/ci-pull-credentials
777+
name: ci-pull-credentials
778+
readOnly: true
779+
- mountPath: /secrets/gcs
780+
name: gcs-credentials
781+
readOnly: true
782+
- mountPath: /usr/local/github-credentials
783+
name: github-credentials-openshift-ci-robot-private-git-cloner
784+
readOnly: true
785+
- mountPath: /secrets/manifest-tool
786+
name: manifest-tool-local-pusher
787+
readOnly: true
788+
- mountPath: /etc/pull-secret
789+
name: pull-secret
790+
readOnly: true
791+
- mountPath: /etc/report
792+
name: result-aggregator
793+
readOnly: true
794+
serviceAccountName: ci-operator
795+
volumes:
796+
- name: boskos
797+
secret:
798+
items:
799+
- key: credentials
800+
path: credentials
801+
secretName: boskos-credentials
802+
- name: ci-pull-credentials
803+
secret:
804+
secretName: ci-pull-credentials
805+
- name: manifest-tool-local-pusher
806+
secret:
807+
secretName: manifest-tool-local-pusher
808+
- name: pull-secret
809+
secret:
810+
secretName: registry-pull-credentials
811+
- name: result-aggregator
812+
secret:
813+
secretName: result-aggregator
814+
trigger: (?m)^/test( | .* )e2e-metal3-capi-techpreview,?($|\s.*)
730815
- agent: kubernetes
731816
always_run: false
732817
branches:

0 commit comments

Comments
 (0)