Skip to content

Commit 5b03f13

Browse files
authored
AGENT-992: Presubmit job to test control plane with 4 and 5 replicas (#58621)
The jobs are named e2e-agent-4control-ipv4 and e2e-agent-5control-ipv4. Requires: openshift/assisted-service#6917
1 parent b5bb720 commit 5b03f13

File tree

2 files changed

+178
-0
lines changed

2 files changed

+178
-0
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,30 @@ tests:
10111011
cluster_profile: equinix-ocp-metal
10121012
workflow: agent-e2e-ha-dualstack
10131013
timeout: 6h0m0s
1014+
- as: e2e-agent-4control-ipv4
1015+
cluster: build05
1016+
optional: true
1017+
run_if_changed: ^(cmd|pkg|data).*/agent/
1018+
steps:
1019+
cluster_profile: equinix-ocp-metal
1020+
env:
1021+
DEVSCRIPTS_CONFIG: |
1022+
AGENT_E2E_TEST_SCENARIO=4CONTROL_IPV4
1023+
NETWORK_TYPE=OVNKubernetes
1024+
workflow: agent-e2e-generic
1025+
timeout: 6h0m0s
1026+
- as: e2e-agent-5control-ipv4
1027+
cluster: build05
1028+
optional: true
1029+
run_if_changed: ^(cmd|pkg|data).*/agent/
1030+
steps:
1031+
cluster_profile: equinix-ocp-metal
1032+
env:
1033+
DEVSCRIPTS_CONFIG: |
1034+
AGENT_E2E_TEST_SCENARIO=5CONTROL_IPV4
1035+
NETWORK_TYPE=OVNKubernetes
1036+
workflow: agent-e2e-generic
1037+
timeout: 6h0m0s
10141038
- as: e2e-aws-ovn-public-subnets
10151039
optional: true
10161040
run_if_changed: /aws/subnet.go

ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,6 +2707,160 @@ presubmits:
27072707
secret:
27082708
secretName: result-aggregator
27092709
trigger: (?m)^/test( | .* )azure-ovn-marketplace-images,?($|\s.*)
2710+
- agent: kubernetes
2711+
always_run: false
2712+
branches:
2713+
- ^master$
2714+
- ^master-
2715+
cluster: build05
2716+
context: ci/prow/e2e-agent-4control-ipv4
2717+
decorate: true
2718+
decoration_config:
2719+
timeout: 6h0m0s
2720+
labels:
2721+
ci-operator.openshift.io/cloud: equinix-ocp-metal
2722+
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
2723+
ci-operator.openshift.io/cluster: build05
2724+
ci.openshift.io/generator: prowgen
2725+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2726+
name: pull-ci-openshift-installer-master-e2e-agent-4control-ipv4
2727+
optional: true
2728+
rerun_command: /test e2e-agent-4control-ipv4
2729+
run_if_changed: ^(cmd|pkg|data).*/agent/
2730+
spec:
2731+
containers:
2732+
- args:
2733+
- --gcs-upload-secret=/secrets/gcs/service-account.json
2734+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2735+
- --lease-server-credentials-file=/etc/boskos/credentials
2736+
- --report-credentials-file=/etc/report/credentials
2737+
- --secret-dir=/secrets/ci-pull-credentials
2738+
- --target=e2e-agent-4control-ipv4
2739+
command:
2740+
- ci-operator
2741+
image: ci-operator:latest
2742+
imagePullPolicy: Always
2743+
name: ""
2744+
resources:
2745+
requests:
2746+
cpu: 10m
2747+
volumeMounts:
2748+
- mountPath: /etc/boskos
2749+
name: boskos
2750+
readOnly: true
2751+
- mountPath: /secrets/ci-pull-credentials
2752+
name: ci-pull-credentials
2753+
readOnly: true
2754+
- mountPath: /secrets/gcs
2755+
name: gcs-credentials
2756+
readOnly: true
2757+
- mountPath: /secrets/manifest-tool
2758+
name: manifest-tool-local-pusher
2759+
readOnly: true
2760+
- mountPath: /etc/pull-secret
2761+
name: pull-secret
2762+
readOnly: true
2763+
- mountPath: /etc/report
2764+
name: result-aggregator
2765+
readOnly: true
2766+
serviceAccountName: ci-operator
2767+
volumes:
2768+
- name: boskos
2769+
secret:
2770+
items:
2771+
- key: credentials
2772+
path: credentials
2773+
secretName: boskos-credentials
2774+
- name: ci-pull-credentials
2775+
secret:
2776+
secretName: ci-pull-credentials
2777+
- name: manifest-tool-local-pusher
2778+
secret:
2779+
secretName: manifest-tool-local-pusher
2780+
- name: pull-secret
2781+
secret:
2782+
secretName: registry-pull-credentials
2783+
- name: result-aggregator
2784+
secret:
2785+
secretName: result-aggregator
2786+
trigger: (?m)^/test( | .* )e2e-agent-4control-ipv4,?($|\s.*)
2787+
- agent: kubernetes
2788+
always_run: false
2789+
branches:
2790+
- ^master$
2791+
- ^master-
2792+
cluster: build05
2793+
context: ci/prow/e2e-agent-5control-ipv4
2794+
decorate: true
2795+
decoration_config:
2796+
timeout: 6h0m0s
2797+
labels:
2798+
ci-operator.openshift.io/cloud: equinix-ocp-metal
2799+
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
2800+
ci-operator.openshift.io/cluster: build05
2801+
ci.openshift.io/generator: prowgen
2802+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2803+
name: pull-ci-openshift-installer-master-e2e-agent-5control-ipv4
2804+
optional: true
2805+
rerun_command: /test e2e-agent-5control-ipv4
2806+
run_if_changed: ^(cmd|pkg|data).*/agent/
2807+
spec:
2808+
containers:
2809+
- args:
2810+
- --gcs-upload-secret=/secrets/gcs/service-account.json
2811+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2812+
- --lease-server-credentials-file=/etc/boskos/credentials
2813+
- --report-credentials-file=/etc/report/credentials
2814+
- --secret-dir=/secrets/ci-pull-credentials
2815+
- --target=e2e-agent-5control-ipv4
2816+
command:
2817+
- ci-operator
2818+
image: ci-operator:latest
2819+
imagePullPolicy: Always
2820+
name: ""
2821+
resources:
2822+
requests:
2823+
cpu: 10m
2824+
volumeMounts:
2825+
- mountPath: /etc/boskos
2826+
name: boskos
2827+
readOnly: true
2828+
- mountPath: /secrets/ci-pull-credentials
2829+
name: ci-pull-credentials
2830+
readOnly: true
2831+
- mountPath: /secrets/gcs
2832+
name: gcs-credentials
2833+
readOnly: true
2834+
- mountPath: /secrets/manifest-tool
2835+
name: manifest-tool-local-pusher
2836+
readOnly: true
2837+
- mountPath: /etc/pull-secret
2838+
name: pull-secret
2839+
readOnly: true
2840+
- mountPath: /etc/report
2841+
name: result-aggregator
2842+
readOnly: true
2843+
serviceAccountName: ci-operator
2844+
volumes:
2845+
- name: boskos
2846+
secret:
2847+
items:
2848+
- key: credentials
2849+
path: credentials
2850+
secretName: boskos-credentials
2851+
- name: ci-pull-credentials
2852+
secret:
2853+
secretName: ci-pull-credentials
2854+
- name: manifest-tool-local-pusher
2855+
secret:
2856+
secretName: manifest-tool-local-pusher
2857+
- name: pull-secret
2858+
secret:
2859+
secretName: registry-pull-credentials
2860+
- name: result-aggregator
2861+
secret:
2862+
secretName: result-aggregator
2863+
trigger: (?m)^/test( | .* )e2e-agent-5control-ipv4,?($|\s.*)
27102864
- agent: kubernetes
27112865
always_run: false
27122866
branches:

0 commit comments

Comments
 (0)