Skip to content

Commit 181b3da

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

File tree

25 files changed

+440
-31
lines changed

25 files changed

+440
-31
lines changed

‎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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,12 @@ 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-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
304305
test:
305306
- chain: openshift-upgrade-qe-test

‎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.19-periodics.yaml‎

Lines changed: 2 additions & 2 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-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-mini-perm-f28
23812381
- --variant=amd64-nightly-4.19-upgrade-from-stable-4.18
23822382
command:
23832383
- 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 * *

‎ci-operator/step-registry/aws/provision/tags-for-byo-vpc/aws-provision-tags-for-byo-vpc-commands.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ fi
3131

3232
echo "infra_id: $infra_id"
3333
vpc_id=$(head -n 1 ${SHARED_DIR}/vpc_id)
34-
private_subnet_ids=$(yq-go r -j ${SHARED_DIR}/private_subnet_ids | jq -r '[ . | join(" ") ] | @csv' | sed "s/\"//g")
34+
35+
if [[ "${OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY}" == "true" ]]; then
36+
private_subnet_ids=$(yq-go r -j ${SHARED_DIR}/public_subnet_ids | jq -r '[ . | join(" ") ] | @csv' | sed "s/\"//g")
37+
else
38+
private_subnet_ids=$(yq-go r -j ${SHARED_DIR}/private_subnet_ids | jq -r '[ . | join(" ") ] | @csv' | sed "s/\"//g")
39+
fi
3540

3641
if [[ -z $vpc_id ]] || [[ -z $private_subnet_ids ]] || [[ -z $infra_id ]] || [[ "${infra_id}" == "null" ]]; then
3742
echo "Error: Can not get VPC id or private subnets, exit"

‎ci-operator/step-registry/aws/provision/tags-for-byo-vpc/aws-provision-tags-for-byo-vpc-ref.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ ref:
1919
default: "no"
2020
- name: EDGE_ZONE_TYPES
2121
default: "local-zone"
22+
- name: OPENSHIFT_INSTALL_AWS_PUBLIC_ONLY
23+
default: ""
24+
documentation: |-
25+
Whether to use only public subnets for AWS. Implies no NAT Gateways.
2226
documentation: |-
2327
Create required tags for BYO VPC, see [1][2] for more details.
2428
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2075072

0 commit comments

Comments
 (0)