Skip to content

Commit ba8158a

Browse files
jianlinliujianlinliu
committed
aws only public subnets coverage
1 parent a5295e5 commit ba8158a

File tree

27 files changed

+430
-34
lines changed

27 files changed

+430
-34
lines changed

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly-4.18-upgrade-from-stable-4.18.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,17 @@ tests:
294294
test:
295295
- chain: openshift-upgrade-qe-test
296296
workflow: cucushift-installer-rehearse-aws-ipi-edge-zone-cco-manual-security-token-service
297-
- as: aws-ipi-workers-marketplace-mini-perm-f60
297+
- as: aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
298298
cron: 11 5 11 2,4,6,8,10,12 *
299299
steps:
300300
cluster_profile: aws-qe
301301
env:
302302
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
303303
BASE_DOMAIN: qe.devcluster.openshift.com
304+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
304305
test:
305306
- chain: openshift-upgrade-qe-test
306-
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace
307+
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace-byo-subnets
307308
- as: aws-sc2s-ipi-disc-priv-fips-f60
308309
cron: 55 15 13 2,4,6,8,10,12 *
309310
steps:

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__amd64-nightly.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,16 +1033,17 @@ tests:
10331033
test:
10341034
- chain: openshift-e2e-test-qe-destructive
10351035
workflow: cucushift-installer-rehearse-aws-ipi-edge-zone-cco-manual-security-token-service
1036-
- as: aws-ipi-workers-marketplace-mini-perm-f7
1036+
- as: aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
10371037
cron: 1 19 5,12,19,28 * *
10381038
steps:
10391039
cluster_profile: aws-qe
10401040
env:
10411041
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
10421042
BASE_DOMAIN: qe.devcluster.openshift.com
1043+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
10431044
test:
10441045
- chain: openshift-e2e-test-qe
1045-
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace
1046+
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace-byo-subnets
10461047
- as: aws-ipi-workers-marketplace-mini-perm-f28-destructive
10471048
cron: 59 15 16 * *
10481049
steps:

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__amd64-nightly-4.19-upgrade-from-stable-4.18.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,17 @@ tests:
295295
test:
296296
- chain: openshift-upgrade-qe-test
297297
workflow: cucushift-installer-rehearse-aws-ipi-edge-zone-cco-manual-security-token-service
298-
- as: aws-ipi-workers-marketplace-f28
298+
- as: aws-ipi-workers-marketplace-public-subnets-mini-perm-f28
299299
cron: 12 6 26 * *
300300
steps:
301301
cluster_profile: aws-qe
302302
env:
303+
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
303304
BASE_DOMAIN: qe.devcluster.openshift.com
305+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
304306
test:
305307
- chain: openshift-upgrade-qe-test
306-
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace
308+
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace-byo-subnets
307309
- as: aws-sc2s-ipi-disc-priv-fips-f28
308310
cron: 51 1 14 * *
309311
steps:

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__amd64-nightly-4.19-upgrade-from-stable-4.19.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,16 +310,17 @@ tests:
310310
test:
311311
- chain: openshift-upgrade-qe-test
312312
workflow: cucushift-installer-rehearse-aws-ipi-edge-zone-cco-manual-security-token-service
313-
- as: aws-ipi-workers-marketplace-mini-perm-f60
313+
- as: aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
314314
cron: 53 18 15 2,4,6,8,10,12 *
315315
steps:
316316
cluster_profile: aws-qe
317317
env:
318318
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
319319
BASE_DOMAIN: qe.devcluster.openshift.com
320+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
320321
test:
321322
- chain: openshift-upgrade-qe-test
322-
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace
323+
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace-byo-subnets
323324
- as: aws-sc2s-ipi-disc-priv-fips-f60
324325
cron: 52 7 15 1,3,5,7,9,11 *
325326
steps:

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__amd64-nightly.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,16 +1068,17 @@ tests:
10681068
test:
10691069
- chain: openshift-e2e-test-qe-destructive
10701070
workflow: cucushift-installer-rehearse-aws-ipi-edge-zone-cco-manual-security-token-service
1071-
- as: aws-ipi-workers-marketplace-mini-perm-f7
1071+
- as: aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
10721072
cron: 30 5 6,13,20,29 * *
10731073
steps:
10741074
cluster_profile: aws-qe
10751075
env:
10761076
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
10771077
BASE_DOMAIN: qe.devcluster.openshift.com
1078+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
10781079
test:
10791080
- chain: openshift-e2e-test-qe
1080-
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace
1081+
workflow: cucushift-installer-rehearse-aws-ipi-workers-marketplace-byo-subnets
10811082
- as: aws-ipi-workers-marketplace-mini-perm-f28-destructive
10821083
cron: 35 2 14 * *
10831084
steps:

‎ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installation-nightly-4.18.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@ tests:
121121
ENABLE_BYO_IAM_ROLE_DEFAULT_MACHINE: "false"
122122
OCP_ARCH: arm64
123123
workflow: cucushift-installer-rehearse-aws-ipi-byo-iam-role
124+
- as: aws-ipi-byo-subnets-only-public-arm-f14
125+
cron: 34 18 1,17 * *
126+
steps:
127+
cluster_profile: aws-qe
128+
dependencies:
129+
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
130+
env:
131+
BASE_DOMAIN: qe.devcluster.openshift.com
132+
COMPUTE_NODE_TYPE: m6g.xlarge
133+
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
134+
OCP_ARCH: arm64
135+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
136+
workflow: cucushift-installer-rehearse-aws-ipi-byo-subnets
124137
- as: aws-ipi-default-mini-perm-arm-f7
125138
cron: 56 23 6,15,22,29 * *
126139
steps:

‎ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installation-nightly-4.19.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@ tests:
121121
ENABLE_BYO_IAM_ROLE_DEFAULT_MACHINE: "false"
122122
OCP_ARCH: arm64
123123
workflow: cucushift-installer-rehearse-aws-ipi-byo-iam-role
124+
- as: aws-ipi-byo-subnets-only-public-arm-f14
125+
cron: 32 8 8,24 * *
126+
steps:
127+
cluster_profile: aws-qe
128+
dependencies:
129+
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
130+
env:
131+
BASE_DOMAIN: qe.devcluster.openshift.com
132+
COMPUTE_NODE_TYPE: m6g.xlarge
133+
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
134+
OCP_ARCH: arm64
135+
OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY: "true"
136+
workflow: cucushift-installer-rehearse-aws-ipi-byo-subnets
124137
- as: aws-ipi-default-mini-perm-arm-f7
125138
cron: 7 21 4,11,20,27 * *
126139
steps:

‎ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18-periodics.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11623,7 +11623,7 @@ periodics:
1162311623
ci-operator.openshift.io/variant: amd64-nightly-4.18-upgrade-from-stable-4.18
1162411624
ci.openshift.io/generator: prowgen
1162511625
pj-rehearse.openshift.io/can-be-rehearsed: "true"
11626-
name: periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-4.18-upgrade-from-stable-4.18-aws-ipi-workers-marketplace-mini-perm-f60
11626+
name: periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-4.18-upgrade-from-stable-4.18-aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
1162711627
spec:
1162811628
containers:
1162911629
- args:
@@ -11633,7 +11633,7 @@ periodics:
1163311633
- --oauth-token-path=/usr/local/github-credentials/oauth
1163411634
- --report-credentials-file=/etc/report/credentials
1163511635
- --secret-dir=/secrets/ci-pull-credentials
11636-
- --target=aws-ipi-workers-marketplace-mini-perm-f60
11636+
- --target=aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
1163711637
- --variant=amd64-nightly-4.18-upgrade-from-stable-4.18
1163811638
command:
1163911639
- ci-operator
@@ -24240,7 +24240,7 @@ periodics:
2424024240
ci.openshift.io/generator: prowgen
2424124241
job-release: "4.18"
2424224242
pj-rehearse.openshift.io/can-be-rehearsed: "true"
24243-
name: periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-aws-ipi-workers-marketplace-mini-perm-f7
24243+
name: periodic-ci-openshift-openshift-tests-private-release-4.18-amd64-nightly-aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
2424424244
spec:
2424524245
containers:
2424624246
- args:
@@ -24250,7 +24250,7 @@ periodics:
2425024250
- --oauth-token-path=/usr/local/github-credentials/oauth
2425124251
- --report-credentials-file=/etc/report/credentials
2425224252
- --secret-dir=/secrets/ci-pull-credentials
24253-
- --target=aws-ipi-workers-marketplace-mini-perm-f7
24253+
- --target=aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
2425424254
- --variant=amd64-nightly
2425524255
command:
2425624256
- ci-operator

‎ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2367,7 +2367,7 @@ periodics:
23672367
ci-operator.openshift.io/variant: amd64-nightly-4.19-upgrade-from-stable-4.18
23682368
ci.openshift.io/generator: prowgen
23692369
pj-rehearse.openshift.io/can-be-rehearsed: "true"
2370-
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-4.19-upgrade-from-stable-4.18-aws-ipi-workers-marketplace-f28
2370+
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-4.19-upgrade-from-stable-4.18-aws-ipi-workers-marketplace-public-subnets-mini-perm-f28
23712371
spec:
23722372
containers:
23732373
- args:
@@ -2377,7 +2377,7 @@ periodics:
23772377
- --oauth-token-path=/usr/local/github-credentials/oauth
23782378
- --report-credentials-file=/etc/report/credentials
23792379
- --secret-dir=/secrets/ci-pull-credentials
2380-
- --target=aws-ipi-workers-marketplace-f28
2380+
- --target=aws-ipi-workers-marketplace-public-subnets-mini-perm-f28
23812381
- --variant=amd64-nightly-4.19-upgrade-from-stable-4.18
23822382
command:
23832383
- ci-operator
@@ -10240,7 +10240,7 @@ periodics:
1024010240
ci-operator.openshift.io/variant: amd64-nightly-4.19-upgrade-from-stable-4.19
1024110241
ci.openshift.io/generator: prowgen
1024210242
pj-rehearse.openshift.io/can-be-rehearsed: "true"
10243-
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-4.19-upgrade-from-stable-4.19-aws-ipi-workers-marketplace-mini-perm-f60
10243+
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-4.19-upgrade-from-stable-4.19-aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
1024410244
spec:
1024510245
containers:
1024610246
- args:
@@ -10250,7 +10250,7 @@ periodics:
1025010250
- --oauth-token-path=/usr/local/github-credentials/oauth
1025110251
- --report-credentials-file=/etc/report/credentials
1025210252
- --secret-dir=/secrets/ci-pull-credentials
10253-
- --target=aws-ipi-workers-marketplace-mini-perm-f60
10253+
- --target=aws-ipi-workers-marketplace-public-subnets-mini-perm-f60
1025410254
- --variant=amd64-nightly-4.19-upgrade-from-stable-4.19
1025510255
command:
1025610256
- ci-operator
@@ -22470,7 +22470,7 @@ periodics:
2247022470
ci.openshift.io/generator: prowgen
2247122471
job-release: "4.19"
2247222472
pj-rehearse.openshift.io/can-be-rehearsed: "true"
22473-
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-workers-marketplace-mini-perm-f7
22473+
name: periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
2247422474
spec:
2247522475
containers:
2247622476
- args:
@@ -22480,7 +22480,7 @@ periodics:
2248022480
- --oauth-token-path=/usr/local/github-credentials/oauth
2248122481
- --report-credentials-file=/etc/report/credentials
2248222482
- --secret-dir=/secrets/ci-pull-credentials
22483-
- --target=aws-ipi-workers-marketplace-mini-perm-f7
22483+
- --target=aws-ipi-workers-marketplace-public-subnets-mini-perm-f7
2248422484
- --variant=amd64-nightly
2248522485
command:
2248622486
- ci-operator

‎ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-master-periodics.yaml‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12529,6 +12529,81 @@ periodics:
1252912529
- name: result-aggregator
1253012530
secret:
1253112531
secretName: result-aggregator
12532+
- agent: kubernetes
12533+
cluster: build03
12534+
cron: 34 18 1,17 * *
12535+
decorate: true
12536+
decoration_config:
12537+
skip_cloning: true
12538+
extra_refs:
12539+
- base_ref: master
12540+
org: openshift
12541+
repo: verification-tests
12542+
labels:
12543+
ci-operator.openshift.io/cloud: aws
12544+
ci-operator.openshift.io/cloud-cluster-profile: aws-qe
12545+
ci-operator.openshift.io/variant: installation-nightly-4.18
12546+
ci.openshift.io/generator: prowgen
12547+
job-release: "4.18"
12548+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
12549+
name: periodic-ci-openshift-verification-tests-master-installation-nightly-4.18-aws-ipi-byo-subnets-only-public-arm-f14
12550+
spec:
12551+
containers:
12552+
- args:
12553+
- --gcs-upload-secret=/secrets/gcs/service-account.json
12554+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
12555+
- --lease-server-credentials-file=/etc/boskos/credentials
12556+
- --report-credentials-file=/etc/report/credentials
12557+
- --secret-dir=/secrets/ci-pull-credentials
12558+
- --target=aws-ipi-byo-subnets-only-public-arm-f14
12559+
- --variant=installation-nightly-4.18
12560+
command:
12561+
- ci-operator
12562+
image: ci-operator:latest
12563+
imagePullPolicy: Always
12564+
name: ""
12565+
resources:
12566+
requests:
12567+
cpu: 10m
12568+
volumeMounts:
12569+
- mountPath: /etc/boskos
12570+
name: boskos
12571+
readOnly: true
12572+
- mountPath: /secrets/ci-pull-credentials
12573+
name: ci-pull-credentials
12574+
readOnly: true
12575+
- mountPath: /secrets/gcs
12576+
name: gcs-credentials
12577+
readOnly: true
12578+
- mountPath: /secrets/manifest-tool
12579+
name: manifest-tool-local-pusher
12580+
readOnly: true
12581+
- mountPath: /etc/pull-secret
12582+
name: pull-secret
12583+
readOnly: true
12584+
- mountPath: /etc/report
12585+
name: result-aggregator
12586+
readOnly: true
12587+
serviceAccountName: ci-operator
12588+
volumes:
12589+
- name: boskos
12590+
secret:
12591+
items:
12592+
- key: credentials
12593+
path: credentials
12594+
secretName: boskos-credentials
12595+
- name: ci-pull-credentials
12596+
secret:
12597+
secretName: ci-pull-credentials
12598+
- name: manifest-tool-local-pusher
12599+
secret:
12600+
secretName: manifest-tool-local-pusher
12601+
- name: pull-secret
12602+
secret:
12603+
secretName: registry-pull-credentials
12604+
- name: result-aggregator
12605+
secret:
12606+
secretName: result-aggregator
1253212607
- agent: kubernetes
1253312608
cluster: build03
1253412609
cron: 56 23 6,15,22,29 * *
@@ -17556,6 +17631,81 @@ periodics:
1755617631
- name: result-aggregator
1755717632
secret:
1755817633
secretName: result-aggregator
17634+
- agent: kubernetes
17635+
cluster: build03
17636+
cron: 32 8 8,24 * *
17637+
decorate: true
17638+
decoration_config:
17639+
skip_cloning: true
17640+
extra_refs:
17641+
- base_ref: master
17642+
org: openshift
17643+
repo: verification-tests
17644+
labels:
17645+
ci-operator.openshift.io/cloud: aws
17646+
ci-operator.openshift.io/cloud-cluster-profile: aws-qe
17647+
ci-operator.openshift.io/variant: installation-nightly-4.19
17648+
ci.openshift.io/generator: prowgen
17649+
job-release: "4.19"
17650+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
17651+
name: periodic-ci-openshift-verification-tests-master-installation-nightly-4.19-aws-ipi-byo-subnets-only-public-arm-f14
17652+
spec:
17653+
containers:
17654+
- args:
17655+
- --gcs-upload-secret=/secrets/gcs/service-account.json
17656+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
17657+
- --lease-server-credentials-file=/etc/boskos/credentials
17658+
- --report-credentials-file=/etc/report/credentials
17659+
- --secret-dir=/secrets/ci-pull-credentials
17660+
- --target=aws-ipi-byo-subnets-only-public-arm-f14
17661+
- --variant=installation-nightly-4.19
17662+
command:
17663+
- ci-operator
17664+
image: ci-operator:latest
17665+
imagePullPolicy: Always
17666+
name: ""
17667+
resources:
17668+
requests:
17669+
cpu: 10m
17670+
volumeMounts:
17671+
- mountPath: /etc/boskos
17672+
name: boskos
17673+
readOnly: true
17674+
- mountPath: /secrets/ci-pull-credentials
17675+
name: ci-pull-credentials
17676+
readOnly: true
17677+
- mountPath: /secrets/gcs
17678+
name: gcs-credentials
17679+
readOnly: true
17680+
- mountPath: /secrets/manifest-tool
17681+
name: manifest-tool-local-pusher
17682+
readOnly: true
17683+
- mountPath: /etc/pull-secret
17684+
name: pull-secret
17685+
readOnly: true
17686+
- mountPath: /etc/report
17687+
name: result-aggregator
17688+
readOnly: true
17689+
serviceAccountName: ci-operator
17690+
volumes:
17691+
- name: boskos
17692+
secret:
17693+
items:
17694+
- key: credentials
17695+
path: credentials
17696+
secretName: boskos-credentials
17697+
- name: ci-pull-credentials
17698+
secret:
17699+
secretName: ci-pull-credentials
17700+
- name: manifest-tool-local-pusher
17701+
secret:
17702+
secretName: manifest-tool-local-pusher
17703+
- name: pull-secret
17704+
secret:
17705+
secretName: registry-pull-credentials
17706+
- name: result-aggregator
17707+
secret:
17708+
secretName: result-aggregator
1755917709
- agent: kubernetes
1756017710
cluster: build03
1756117711
cron: 7 21 4,11,20,27 * *

0 commit comments

Comments
 (0)