Skip to content

USHIFT-1201: Transition to AWS #38877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 9 commits into from
May 4, 2023
Merged

USHIFT-1201: Transition to AWS #38877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e64227
add loadbalancer-smoketest aws workflow
copejon Apr 28, 2023
a5f95a4
add e2e-reboot aws workflow
copejon Apr 28, 2023
4322006
add e2e-greenboot-aws workflow
copejon Apr 28, 2023
7fcc7f1
add router-smoketest aws workflow
copejon Apr 28, 2023
1366334
add e2e-test aws workflow
copejon Apr 28, 2023
150f769
apply transition to aws
copejon May 1, 2023
43af37a
make update
copejon May 3, 2023
37c75bb
change CPU to c6g to workaround resource shortage
copejon May 3, 2023
89898d6
minimizing the diff to be certain i'm not adding a test that wasn't t…
copejon May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 50 additions & 44 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,15 @@ tag_specification:
tests:
- as: verify
cluster: build02
commands: make verify
container:
from: src
steps:
test:
- as: verify
commands: make verify
from: src
resources:
requests:
cpu: 100m
memory: 200Mi
- as: test-unit
cluster: build02
commands: make test-unit
Expand All @@ -115,76 +121,76 @@ tests:
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-openshift-conformance-reduced
EC2_AMI: ami-07f5ac8ddbcfbb96e
workflow: openshift-microshift-e2e-openshift-conformance-reduced-aws
- as: e2e-openshift-conformance-reduced-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-openshift-conformance-reduced
EC2_AMI: ami-0c231be9fb222349e
EC2_INSTANCE_TYPE: c6g.2xlarge
workflow: openshift-microshift-e2e-openshift-conformance-reduced-aws
- as: e2e-reboot
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-reboot-tests
EC2_AMI: ami-07f5ac8ddbcfbb96e
workflow: openshift-microshift-e2e-reboot-tests-aws
- as: e2e-reboot-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-reboot-tests
EC2_AMI: ami-0c231be9fb222349e
EC2_INSTANCE_TYPE: c6g.2xlarge
workflow: openshift-microshift-e2e-reboot-tests-aws
- as: e2e-greenboot
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-greenboot
EC2_AMI: ami-07f5ac8ddbcfbb96e
workflow: openshift-microshift-e2e-greenboot-aws
- as: e2e-greenboot-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-greenboot
EC2_AMI: ami-0c231be9fb222349e
EC2_INSTANCE_TYPE: c6g.2xlarge
workflow: openshift-microshift-e2e-greenboot-aws
- as: e2e-router-smoke-test
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-router-smoke-test
EC2_AMI: ami-07f5ac8ddbcfbb96e
workflow: openshift-microshift-e2e-router-smoke-test-aws
- as: e2e-router-smoke-test-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-router-smoke-test
EC2_AMI: ami-0c231be9fb222349e
EC2_INSTANCE_TYPE: c6g.2xlarge
workflow: openshift-microshift-e2e-router-smoke-test-aws
- as: rebase-on-nightlies
cron: 0 5 * * 1-5
steps:
Expand All @@ -194,36 +200,36 @@ tests:
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
EC2_AMI: ami-07f5ac8ddbcfbb96e
workflow: openshift-microshift-e2e-loadbalancer-smoke-test-aws
- as: e2e-loadbalancer-smoke-test-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
EC2_AMI: ami-0c231be9fb222349e
EC2_INSTANCE_TYPE: c6g.2xlarge
workflow: openshift-microshift-e2e-loadbalancer-smoke-test-aws
- as: nightly-conformance-parallel
Copy link
Copy Markdown
Contributor

@pacevedom pacevedom May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to keep these nightlies for reporting to testgrid.

cron: 0 0 * * 1-5
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
EC2_AMI: ami-07f5ac8ddbcfbb96e
TEST_SUITE: openshift/conformance/parallel
workflow: openshift-microshift-e2e-test
workflow: openshift-microshift-e2e-test-aws
- as: nightly-conformance-serial
cron: 0 0 * * 1-5
steps:
cluster_profile: gcp
cluster_profile: aws
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
EC2_AMI: ami-07f5ac8ddbcfbb96e
TEST_SUITE: openshift/conformance/serial
workflow: openshift-microshift-e2e-test
workflow: openshift-microshift-e2e-test-aws
zz_generated_metadata:
branch: release-4.13
org: openshift
Expand Down
28 changes: 10 additions & 18 deletions ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.13-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
periodics:
- agent: kubernetes
cluster: build02
cluster: build01
cron: 0 0 * * 1-5
decorate: true
decoration_config:
Expand All @@ -10,8 +10,8 @@ periodics:
org: openshift
repo: microshift
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcp
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.13-nightly-conformance-parallel
Expand Down Expand Up @@ -63,20 +63,16 @@ periodics:
secret:
secretName: ci-pull-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-gcp
- configMap:
name: cluster-profile-gcp
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
cluster: build01
cron: 0 0 * * 1-5
decorate: true
decoration_config:
Expand All @@ -86,8 +82,8 @@ periodics:
org: openshift
repo: microshift
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcp
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.13-nightly-conformance-serial
Expand Down Expand Up @@ -139,12 +135,8 @@ periodics:
secret:
secretName: ci-pull-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-gcp
- configMap:
name: cluster-profile-gcp
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
Expand Down
Loading