Skip to content
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.

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

OCPQE-21002 - Review 4.14 upgrade ci jobs and add missing jobs #60384

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@ tests:
test:
- chain: openshift-upgrade-qe-sanity-disconnected
workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private-cco-manual-security-token-service-private-s3-with-ep-sts-ec2-elb
- as: aws-usgov-ipi-private-sts-f28
cron: 3 21 21 * *
steps:
cluster_profile: aws-usgov-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
EXTRACT_MANIFEST_INCLUDED: "true"
test:
- chain: cucushift-installer-check-cluster-health
workflow: cucushift-installer-rehearse-aws-usgov-ipi-private-cco-manual-security-token-service
- as: azure-ipi-disc-fullyprivate-f28
cron: 0 15 21 * *
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,26 @@ tests:
test:
- chain: openshift-upgrade-qe-test-disconnected
workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private
- as: aws-ipi-disc-priv-sts-basecap-none-f28
cron: 25 2 5 * *
steps:
cluster_profile: aws-qe
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
E2E_RUN_TAGS: '@disconnected'
EXTRACT_MANIFEST_INCLUDED: "true"
OCP_ARCH: arm64
PERSISTENT_MONITORING: "false"
TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~ConnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private-cco-manual-security-token-service
- as: aws-ipi-disc-priv-sts-efs-f60
cron: 15 3 16 1,3,5,7,9,11 *
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,18 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-aws-ipi-imdsv2
- as: aws-ipi-ingress-lbtype-classic-arm-f28
cron: 55 7 24 * *
steps:
cluster_profile: aws-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-ingress-lbtype-classic
- as: aws-ipi-ingress-lbtype-nlb-arm-f28
cron: 22 18 13 * *
steps:
Expand All @@ -116,6 +128,18 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-aws-ipi-ingress-lbtype-nlb
- as: aws-ipi-mini-perm-arm-f28
cron: 54 19 15 * *
steps:
cluster_profile: aws-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-minimal-permission
- as: aws-ipi-ovn-ipsec-arm-mixarch-f28
cron: 1 17 21 * *
steps:
Expand Down Expand Up @@ -165,6 +189,45 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-aws-ipi-proxy-cco-manual-security-token-service
- as: aws-ipi-sdn-arm-f28
cron: 4 9 3 * *
steps:
Comment on lines +192 to +194
Copy link
Contributor

Choose a reason for hiding this comment

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

I think sdn network is the default network in OCP 4.14. so we don't need to add this job.
@zhaozhanqi @jianlinliu Please correct me if I am wrong.

cluster_profile: aws-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-sdn
- as: aws-ipi-sno-etcd-encryption-basecap-none-arm-f28
cron: 6 20 19 * *
steps:
cluster_profile: aws-qe
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.2xlarge
OCP_ARCH: arm64
PERSISTENT_MONITORING: "false"
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-sno-etcd-encryption
- as: aws-ipi-usertags-custom-sg-arm-f28
cron: 34 5 15 * *
steps:
cluster_profile: aws-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-ipi-usertags-custom-security-groups
- as: aws-ipi-usertags-fips-amd-f28
cron: 41 3 13 * *
steps:
Expand All @@ -186,6 +249,49 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-aws-upi
- as: aws-upi-basecap-none-arm-f28
cron: 1 23 28 * *
steps:
cluster_profile: aws-qe
env:
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
BOOTSTRAP_INSTANCE_TYPE: m6g.large
MASTER_INSTANCE_TYPE: m6g.xlarge
OCP_ARCH: arm64
PERSISTENT_MONITORING: "false"
WORKER_INSTANCE_TYPE: m6g.xlarge
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-aws-upi
- as: azure-ipi-arm-mixarch-f28
cron: 0 1 25 * *
steps:
cluster_profile: azure-qe
env:
ADDITIONAL_WORKER_ARCHITECTURE: x86_64
ADDITIONAL_WORKER_VM_TYPE: Standard_D4s_v3
ADDITIONAL_WORKERS: "1"
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "2"
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
test:
- ref: ipi-install-heterogeneous
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi
- as: azure-ipi-basecap-vset-additionalcap-arm-f28
cron: 14 5 22 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
PERSISTENT_MONITORING: "false"
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-capability-baselinecaps-vset-additionalcaps
- as: azure-ipi-des-fips-amd-f28
cron: 31 8 2 * *
steps:
Expand All @@ -208,6 +314,22 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-ipi-fullyprivate-proxy
- as: azure-ipi-ingress-controller-arm-mixarch-f28
cron: 59 13 23 * *
steps:
cluster_profile: azure-qe
env:
ADDITIONAL_WORKER_ARCHITECTURE: x86_64
ADDITIONAL_WORKER_VM_TYPE: Standard_D4s_v3
ADDITIONAL_WORKERS: "1"
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "2"
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
test:
- ref: ipi-install-heterogeneous
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-ingress-custom-controller
- as: azure-ipi-ingress-custom-controller-fips-amd-f28
cron: 11 6 5 * *
steps:
Expand All @@ -218,6 +340,30 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-ipi-ingress-custom-controller
- as: azure-ipi-oidc-mini-perm-arm-f28
cron: 11 1 11 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
EXTRACT_MANIFEST_INCLUDED: "true"
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-cco-manual-workload-identity-minimal-permission
- as: azure-ipi-ovn-etcd-encryption-compact-arm-f28
cron: 15 4 9 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
SIZE_VARIANT: compact
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-ovn-etcd-encryption
- as: azure-ipi-ovn-ipsec-arm-mixarch-day2-f28
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please help remove this job?

Copy link
Contributor Author

@dis016 dis016 Jan 8, 2025

Choose a reason for hiding this comment

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

Need to remove both azure-ipi-oidc-mini-perm-arm-f28 and azure-ipi-ovn-etcd-encryption-compact-arm-f28 the jobs?

Copy link
Contributor

Choose a reason for hiding this comment

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

for this comment, I mean azure-ipi-ovn-ipsec-arm-mixarch-day2-f28, because we have other job covered cucushift-installer-rehearse-azure-ipi-ovn-ipsec

cron: 36 11 22 * *
steps:
Expand Down Expand Up @@ -246,6 +392,54 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-ipi-ovn-ipsec-azurefile-csi
- as: azure-ipi-private-spec-net-type-spec-perm-arm-f28
cron: 46 16 6 * *
steps:
cluster_profile: azure-qe
env:
AZURE_COMPUTE_NETWORKING_TYPE: Basic
AZURE_DEFAULT_MACHINE_NETWORKING_TYPE: Accelerated
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
CONTROL_PLANE_INSTANCE_TYPE: Standard_D8ps_v5
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-private-networking-type-minimal-permission
- as: azure-ipi-sdn-arm-f28
cron: 25 8 7 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-sdn
- as: azure-ipi-sno-etcd-encryption-arm-f28
cron: 27 6 17 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
SINGLE_NODE_AZURE_INSTANCE_TYPE: Standard_D32ps_v5
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-sno-etcd-encryption
- as: azure-ipi-ultrassd-disks-arm-f28
cron: 21 4 14 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-ultrassd-disk
- as: azure-ipi-ultrassd-disks-fips-amd-f28
cron: 37 18 15 * *
steps:
Expand All @@ -257,6 +451,17 @@ tests:
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-ipi-ultrassd-disk
- as: azure-ipi-usertags-arm-f28
cron: 43 10 5 * *
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
OCP_ARCH: arm64
test:
- chain: openshift-e2e-test-qe
workflow: cucushift-installer-rehearse-azure-ipi-usertags
- as: azure-upi-arm-f28
cron: 34 0 8 * *
steps:
Expand Down
Loading