Skip to content

Commit a4b3b5b

Browse files
Merge pull request #78669 from openshift/auto-config-brancher
Automate config brancher by auto-config-brancher job at Thu, 30 Apr 2026 20:07:52 UTC
2 parents e653eab + 8939691 commit a4b3b5b

10 files changed

Lines changed: 460 additions & 0 deletions

ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@ tests:
122122
steps:
123123
cluster_profile: openshift-org-gcp
124124
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125+
- always_run: false
126+
as: e2e-gcp-manual-oidc-pool-jwk-file
127+
optional: true
128+
steps:
129+
cluster_profile: openshift-org-gcp
130+
env:
131+
KEY_STORAGE_METHOD: pool-jwk-file
132+
TEST_SKIPS: ServiceAccountIssuerDiscovery should support OIDC discovery of service
133+
account issuer
134+
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125135
- always_run: false
126136
as: e2e-openstack
127137
optional: true

ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.22.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@ tests:
122122
steps:
123123
cluster_profile: openshift-org-gcp
124124
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125+
- always_run: false
126+
as: e2e-gcp-manual-oidc-pool-jwk-file
127+
optional: true
128+
steps:
129+
cluster_profile: openshift-org-gcp
130+
env:
131+
KEY_STORAGE_METHOD: pool-jwk-file
132+
TEST_SKIPS: ServiceAccountIssuerDiscovery should support OIDC discovery of service
133+
account issuer
134+
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125135
- always_run: false
126136
as: e2e-openstack
127137
optional: true

ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.23.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@ tests:
122122
steps:
123123
cluster_profile: openshift-org-gcp
124124
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125+
- always_run: false
126+
as: e2e-gcp-manual-oidc-pool-jwk-file
127+
optional: true
128+
steps:
129+
cluster_profile: openshift-org-gcp
130+
env:
131+
KEY_STORAGE_METHOD: pool-jwk-file
132+
TEST_SKIPS: ServiceAccountIssuerDiscovery should support OIDC discovery of service
133+
account issuer
134+
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125135
- always_run: false
126136
as: e2e-openstack
127137
optional: true

ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-5.0.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@ tests:
123123
steps:
124124
cluster_profile: openshift-org-gcp
125125
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
126+
- always_run: false
127+
as: e2e-gcp-manual-oidc-pool-jwk-file
128+
optional: true
129+
steps:
130+
cluster_profile: openshift-org-gcp
131+
env:
132+
KEY_STORAGE_METHOD: pool-jwk-file
133+
TEST_SKIPS: ServiceAccountIssuerDiscovery should support OIDC discovery of service
134+
account issuer
135+
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
126136
- always_run: false
127137
as: e2e-openstack
128138
optional: true

ci-operator/config/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-5.1.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,16 @@ tests:
122122
steps:
123123
cluster_profile: openshift-org-gcp
124124
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125+
- always_run: false
126+
as: e2e-gcp-manual-oidc-pool-jwk-file
127+
optional: true
128+
steps:
129+
cluster_profile: openshift-org-gcp
130+
env:
131+
KEY_STORAGE_METHOD: pool-jwk-file
132+
TEST_SKIPS: ServiceAccountIssuerDiscovery should support OIDC discovery of service
133+
account issuer
134+
workflow: openshift-e2e-gcp-manual-oidc-workload-identity
125135
- always_run: false
126136
as: e2e-openstack
127137
optional: true

ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-master-presubmits.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,88 @@ presubmits:
727727
secret:
728728
secretName: result-aggregator
729729
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc,?($|\s.*)
730+
- agent: kubernetes
731+
always_run: false
732+
branches:
733+
- ^master$
734+
- ^master-
735+
cluster: build08
736+
context: ci/prow/e2e-gcp-manual-oidc-pool-jwk-file
737+
decorate: true
738+
labels:
739+
ci-operator.openshift.io/cloud: gcp
740+
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
741+
ci.openshift.io/generator: prowgen
742+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
743+
name: pull-ci-openshift-priv-cloud-credential-operator-master-e2e-gcp-manual-oidc-pool-jwk-file
744+
optional: true
745+
path_alias: github.com/openshift/cloud-credential-operator
746+
rerun_command: /test e2e-gcp-manual-oidc-pool-jwk-file
747+
spec:
748+
containers:
749+
- args:
750+
- --gcs-upload-secret=/secrets/gcs/service-account.json
751+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
752+
- --lease-server-credentials-file=/etc/boskos/credentials
753+
- --report-credentials-file=/etc/report/credentials
754+
- --secret-dir=/secrets/ci-pull-credentials
755+
- --target=e2e-gcp-manual-oidc-pool-jwk-file
756+
command:
757+
- ci-operator
758+
env:
759+
- name: HTTP_SERVER_IP
760+
valueFrom:
761+
fieldRef:
762+
fieldPath: status.podIP
763+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
764+
imagePullPolicy: Always
765+
name: ""
766+
ports:
767+
- containerPort: 8080
768+
name: http
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: /secrets/manifest-tool
783+
name: manifest-tool-local-pusher
784+
readOnly: true
785+
- mountPath: /etc/pull-secret
786+
name: pull-secret
787+
readOnly: true
788+
- mountPath: /etc/report
789+
name: result-aggregator
790+
readOnly: true
791+
serviceAccountName: ci-operator
792+
volumes:
793+
- name: boskos
794+
secret:
795+
items:
796+
- key: credentials
797+
path: credentials
798+
secretName: boskos-credentials
799+
- name: ci-pull-credentials
800+
secret:
801+
secretName: ci-pull-credentials
802+
- name: manifest-tool-local-pusher
803+
secret:
804+
secretName: manifest-tool-local-pusher
805+
- name: pull-secret
806+
secret:
807+
secretName: registry-pull-credentials
808+
- name: result-aggregator
809+
secret:
810+
secretName: result-aggregator
811+
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc-pool-jwk-file,?($|\s.*)
730812
- agent: kubernetes
731813
always_run: false
732814
branches:

ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.22-presubmits.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,88 @@ presubmits:
727727
secret:
728728
secretName: result-aggregator
729729
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc,?($|\s.*)
730+
- agent: kubernetes
731+
always_run: false
732+
branches:
733+
- ^release-4\.22$
734+
- ^release-4\.22-
735+
cluster: build08
736+
context: ci/prow/e2e-gcp-manual-oidc-pool-jwk-file
737+
decorate: true
738+
labels:
739+
ci-operator.openshift.io/cloud: gcp
740+
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
741+
ci.openshift.io/generator: prowgen
742+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
743+
name: pull-ci-openshift-priv-cloud-credential-operator-release-4.22-e2e-gcp-manual-oidc-pool-jwk-file
744+
optional: true
745+
path_alias: github.com/openshift/cloud-credential-operator
746+
rerun_command: /test e2e-gcp-manual-oidc-pool-jwk-file
747+
spec:
748+
containers:
749+
- args:
750+
- --gcs-upload-secret=/secrets/gcs/service-account.json
751+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
752+
- --lease-server-credentials-file=/etc/boskos/credentials
753+
- --report-credentials-file=/etc/report/credentials
754+
- --secret-dir=/secrets/ci-pull-credentials
755+
- --target=e2e-gcp-manual-oidc-pool-jwk-file
756+
command:
757+
- ci-operator
758+
env:
759+
- name: HTTP_SERVER_IP
760+
valueFrom:
761+
fieldRef:
762+
fieldPath: status.podIP
763+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
764+
imagePullPolicy: Always
765+
name: ""
766+
ports:
767+
- containerPort: 8080
768+
name: http
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: /secrets/manifest-tool
783+
name: manifest-tool-local-pusher
784+
readOnly: true
785+
- mountPath: /etc/pull-secret
786+
name: pull-secret
787+
readOnly: true
788+
- mountPath: /etc/report
789+
name: result-aggregator
790+
readOnly: true
791+
serviceAccountName: ci-operator
792+
volumes:
793+
- name: boskos
794+
secret:
795+
items:
796+
- key: credentials
797+
path: credentials
798+
secretName: boskos-credentials
799+
- name: ci-pull-credentials
800+
secret:
801+
secretName: ci-pull-credentials
802+
- name: manifest-tool-local-pusher
803+
secret:
804+
secretName: manifest-tool-local-pusher
805+
- name: pull-secret
806+
secret:
807+
secretName: registry-pull-credentials
808+
- name: result-aggregator
809+
secret:
810+
secretName: result-aggregator
811+
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc-pool-jwk-file,?($|\s.*)
730812
- agent: kubernetes
731813
always_run: false
732814
branches:

ci-operator/jobs/openshift-priv/cloud-credential-operator/openshift-priv-cloud-credential-operator-release-4.23-presubmits.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,88 @@ presubmits:
727727
secret:
728728
secretName: result-aggregator
729729
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc,?($|\s.*)
730+
- agent: kubernetes
731+
always_run: false
732+
branches:
733+
- ^release-4\.23$
734+
- ^release-4\.23-
735+
cluster: build08
736+
context: ci/prow/e2e-gcp-manual-oidc-pool-jwk-file
737+
decorate: true
738+
labels:
739+
ci-operator.openshift.io/cloud: gcp
740+
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp
741+
ci.openshift.io/generator: prowgen
742+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
743+
name: pull-ci-openshift-priv-cloud-credential-operator-release-4.23-e2e-gcp-manual-oidc-pool-jwk-file
744+
optional: true
745+
path_alias: github.com/openshift/cloud-credential-operator
746+
rerun_command: /test e2e-gcp-manual-oidc-pool-jwk-file
747+
spec:
748+
containers:
749+
- args:
750+
- --gcs-upload-secret=/secrets/gcs/service-account.json
751+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
752+
- --lease-server-credentials-file=/etc/boskos/credentials
753+
- --report-credentials-file=/etc/report/credentials
754+
- --secret-dir=/secrets/ci-pull-credentials
755+
- --target=e2e-gcp-manual-oidc-pool-jwk-file
756+
command:
757+
- ci-operator
758+
env:
759+
- name: HTTP_SERVER_IP
760+
valueFrom:
761+
fieldRef:
762+
fieldPath: status.podIP
763+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
764+
imagePullPolicy: Always
765+
name: ""
766+
ports:
767+
- containerPort: 8080
768+
name: http
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: /secrets/manifest-tool
783+
name: manifest-tool-local-pusher
784+
readOnly: true
785+
- mountPath: /etc/pull-secret
786+
name: pull-secret
787+
readOnly: true
788+
- mountPath: /etc/report
789+
name: result-aggregator
790+
readOnly: true
791+
serviceAccountName: ci-operator
792+
volumes:
793+
- name: boskos
794+
secret:
795+
items:
796+
- key: credentials
797+
path: credentials
798+
secretName: boskos-credentials
799+
- name: ci-pull-credentials
800+
secret:
801+
secretName: ci-pull-credentials
802+
- name: manifest-tool-local-pusher
803+
secret:
804+
secretName: manifest-tool-local-pusher
805+
- name: pull-secret
806+
secret:
807+
secretName: registry-pull-credentials
808+
- name: result-aggregator
809+
secret:
810+
secretName: result-aggregator
811+
trigger: (?m)^/test( | .* )e2e-gcp-manual-oidc-pool-jwk-file,?($|\s.*)
730812
- agent: kubernetes
731813
always_run: false
732814
branches:

0 commit comments

Comments
 (0)