Skip to content

Commit

Permalink
Remove 1.26 E2E tests for Tinkerbell (#8757)
Browse files Browse the repository at this point in the history
  • Loading branch information
sp1999 authored Sep 14, 2024
1 parent 9ba2b30 commit deba3d8
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 317 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,27 +152,23 @@ env:
T_SNOW_CERTIFICATES_S3_PATH: "snow_ci:snow_certificates_s3_path"
T_SNOW_CONTROL_PLANE_CIDRS: "snow_ci:control_plane_cidrs"
# Tinkerbell secrets
T_TINKERBELL_IMAGE_UBUNTU_1_26: "tinkerbell_ci:image_ubuntu_1_26"
T_TINKERBELL_IMAGE_UBUNTU_1_27: "tinkerbell_ci:image_ubuntu_1_27"
T_TINKERBELL_IMAGE_UBUNTU_1_28: "tinkerbell_ci:image_ubuntu_1_28"
T_TINKERBELL_IMAGE_UBUNTU_1_29: "tinkerbell_ci:image_ubuntu_1_29"
T_TINKERBELL_IMAGE_UBUNTU_1_30: "tinkerbell_ci:image_ubuntu_1_30"
T_TINKERBELL_IMAGE_UBUNTU_1_31: "tinkerbell_ci:image_ubuntu_1_31"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_26: "tinkerbell_ci:image_ubuntu_2204_1_26"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_27: "tinkerbell_ci:image_ubuntu_2204_1_27"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_28: "tinkerbell_ci:image_ubuntu_2204_1_28"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29: "tinkerbell_ci:image_ubuntu_2204_1_29"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29_RTOS: "tinkerbell_ci:image_ubuntu_2204_1_29_rtos"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29_GENERIC: "tinkerbell_ci:image_ubuntu_2204_1_29_generic"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_30: "tinkerbell_ci:image_ubuntu_2204_1_30"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_31: "tinkerbell_ci:image_ubuntu_2204_1_31"
T_TINKERBELL_IMAGE_REDHAT_1_26: "tinkerbell_ci:image_redhat_1_26"
T_TINKERBELL_IMAGE_REDHAT_1_27: "tinkerbell_ci:image_redhat_1_27"
T_TINKERBELL_IMAGE_REDHAT_1_28: "tinkerbell_ci:image_redhat_1_28"
T_TINKERBELL_IMAGE_REDHAT_1_29: "tinkerbell_ci:image_redhat_1_29"
T_TINKERBELL_IMAGE_REDHAT_1_30: "tinkerbell_ci:image_redhat_1_30"
T_TINKERBELL_IMAGE_REDHAT_1_31: "tinkerbell_ci:image_redhat_1_31"
T_TINKERBELL_IMAGE_REDHAT_9_1_26: "tinkerbell_ci:image_redhat_9_1_26"
T_TINKERBELL_IMAGE_REDHAT_9_1_27: "tinkerbell_ci:image_redhat_9_1_27"
T_TINKERBELL_IMAGE_REDHAT_9_1_28: "tinkerbell_ci:image_redhat_9_1_28"
T_TINKERBELL_IMAGE_REDHAT_9_1_29: "tinkerbell_ci:image_redhat_9_1_29"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,23 @@ env:
T_PRIVATE_REGISTRY_MIRROR_PASSWORD_TINKERBELL: "harbor-registry-data:authenticated_tinkerbell_password"
T_PRIVATE_REGISTRY_MIRROR_CA_CERT_TINKERBELL: "harbor-registry-data:authenticated_tinkerbell_caCert"
T_AWS_IAM_ROLE_ARN: "aws-iam-auth-role:ec2_role_arn"
T_TINKERBELL_IMAGE_UBUNTU_1_26: "tinkerbell_ci:image_ubuntu_1_26"
T_TINKERBELL_IMAGE_UBUNTU_1_27: "tinkerbell_ci:image_ubuntu_1_27"
T_TINKERBELL_IMAGE_UBUNTU_1_28: "tinkerbell_ci:image_ubuntu_1_28"
T_TINKERBELL_IMAGE_UBUNTU_1_29: "tinkerbell_ci:image_ubuntu_1_29"
T_TINKERBELL_IMAGE_UBUNTU_1_30: "tinkerbell_ci:image_ubuntu_1_30"
T_TINKERBELL_IMAGE_UBUNTU_1_31: "tinkerbell_ci:image_ubuntu_1_31"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_26: "tinkerbell_ci:image_ubuntu_2204_1_26"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_27: "tinkerbell_ci:image_ubuntu_2204_1_27"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_28: "tinkerbell_ci:image_ubuntu_2204_1_28"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29: "tinkerbell_ci:image_ubuntu_2204_1_29"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29_RTOS: "tinkerbell_ci:image_ubuntu_2204_1_29_rtos"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_29_GENERIC: "tinkerbell_ci:image_ubuntu_2204_1_29_generic"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_30: "tinkerbell_ci:image_ubuntu_2204_1_30"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_31: "tinkerbell_ci:image_ubuntu_2204_1_31"
T_TINKERBELL_IMAGE_REDHAT_1_26: "tinkerbell_ci:image_redhat_1_26"
T_TINKERBELL_IMAGE_REDHAT_1_27: "tinkerbell_ci:image_redhat_1_27"
T_TINKERBELL_IMAGE_REDHAT_1_28: "tinkerbell_ci:image_redhat_1_28"
T_TINKERBELL_IMAGE_REDHAT_1_29: "tinkerbell_ci:image_redhat_1_29"
T_TINKERBELL_IMAGE_REDHAT_1_30: "tinkerbell_ci:image_redhat_1_30"
T_TINKERBELL_IMAGE_REDHAT_1_31: "tinkerbell_ci:image_redhat_1_31"
T_TINKERBELL_IMAGE_REDHAT_9_1_26: "tinkerbell_ci:image_redhat_9_1_26"
T_TINKERBELL_IMAGE_REDHAT_9_1_27: "tinkerbell_ci:image_redhat_9_1_27"
T_TINKERBELL_IMAGE_REDHAT_9_1_28: "tinkerbell_ci:image_redhat_9_1_28"
T_TINKERBELL_IMAGE_REDHAT_9_1_29: "tinkerbell_ci:image_redhat_9_1_29"
Expand Down
14 changes: 1 addition & 13 deletions test/e2e/SKIPPED_TESTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,34 +52,28 @@ skipped_tests:
# Skipping skip power action tests - Not going to work because e2e test powers on CP and worker node at the same time and worker node times out early waiting for ipxe
# Skipping a few redundant tests
# For RHEL 9 Tinkerbell tests, only enable test case for latest kubernetes version 1.31 due to limited testing resources.
- TestTinkerbellKubernetes126RedHatSimpleFlow
- TestTinkerbellKubernetes127RedHatSimpleFlow
- TestTinkerbellKubernetes128RedHatSimpleFlow
- TestTinkerbellKubernetes129RedHatSimpleFlow
- TestTinkerbellKubernetes130RedHatSimpleFlow
- TestTinkerbellKubernetes131RedHatSimpleFlow
- TestTinkerbellKubernetes126RedHat9SimpleFlow
- TestTinkerbellKubernetes127RedHat9SimpleFlow
- TestTinkerbellKubernetes128RedHat9SimpleFlow
- TestTinkerbellKubernetes129RedHat9SimpleFlow
- TestTinkerbellKubernetes130RedHat9SimpleFlow
- TestTinkerbellKubernetes126Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes127Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes128Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes129Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes130Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes126To127Ubuntu2204Upgrade
- TestTinkerbellKubernetes127To128Ubuntu2204Upgrade
- TestTinkerbellKubernetes128To129Ubuntu2204Upgrade
- TestTinkerbellKubernetes129To130Ubuntu2204Upgrade
- TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade

#Skip single K8s version upgrade tests as the same is covered by multiple K8s version upgrade from 1.26 to 1.31 to save on hardware resources and running time
- TestTinkerbellKubernetes126UbuntuTo127Upgrade
#Skip single K8s version upgrade tests as the same is covered by multiple K8s version upgrade from 1.27 to 1.31 to save on hardware resources and running time
- TestTinkerbellKubernetes127UbuntuTo128Upgrade
- TestTinkerbellKubernetes128UbuntuTo129Upgrade
- TestTinkerbellKubernetes129UbuntuTo130Upgrade
Expand All @@ -88,18 +82,12 @@ skipped_tests:

# Tinkerbell Packages
# Skip test cases for packages other than hello-eks-anywhere and not for K8s 1.31.
- TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesEmissaryFlow
- TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesHarborFlow
- TestTinkerbellKubernetes126UbuntuCuratedPackagesAdotSimpleFlow
- TestTinkerbellKubernetes126UbuntuCuratedPackagesPrometheusSimpleFlow
- TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesEmissaryFlow
- TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow
- TestTinkerbellKubernetes127UbuntuCuratedPackagesAdotSimpleFlow
- TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow

# Tinkerbell conformance
- TestTinkerbellKubernetes126BottleRocketThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes126ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes127ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes128ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes129ThreeReplicasTwoWorkersConformanceFlow
Expand Down
22 changes: 1 addition & 21 deletions test/e2e/TINKERBELL_HARDWARE_COUNT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@ TestTinkerbellKubernetes127BottleRocketCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes127BottleRocketCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes127UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3
TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes126BottleRocketSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1
TestTinkerbellKubernetes126BottleRocketSingleNodeCuratedPackagesEmissaryFlow: 1
TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesHarborFlow: 1
TestTinkerbellKubernetes126BottleRocketSingleNodeCuratedPackagesHarborFlow: 1
TestTinkerbellKubernetes126UbuntuCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes126BottleRocketCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes126UbuntuCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes126BottleRocketCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes131UbuntuSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes131UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1
Expand All @@ -47,19 +37,16 @@ TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadCluster: 2
TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadClusterWithAPI: 2
TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions: 4
TestTinkerbellUpgrade131MulticlusterWorkloadClusterWorkerScaleup: 5
TestTinkerbellKubernetes126UbuntuTo127Upgrade: 4
TestTinkerbellKubernetes127UbuntuTo128Upgrade: 4
TestTinkerbellKubernetes128UbuntuTo129Upgrade: 4
TestTinkerbellKubernetes129UbuntuTo130Upgrade: 4
TestTinkerbellKubernetes130UbuntuTo131Upgrade: 4
TestTinkerbellKubernetes126To127Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes127To128Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes128To129Ubuntu2204RTOSUpgrade: 4
TestTinkerbellKubernetes128To129Ubuntu2204GenericUpgrade: 4
TestTinkerbellKubernetes129To130Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes130To131Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade: 4
Expand All @@ -76,33 +63,28 @@ TestTinkerbellKubernetes131UbuntuInsecureSkipVerifyRegistryMirror: 2
TestTinkerbellKubernetes128BottlerocketRegistryMirror: 2
TestTinkerbellKubernetes131UbuntuAuthenticatedRegistryMirror: 2
TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2
TestTinkerbellKubernetes126UbuntuSimpleFlow: 2
TestTinkerbellKubernetes127UbuntuSimpleFlow: 2
TestTinkerbellKubernetes128UbuntuSimpleFlow: 2
TestTinkerbellKubernetes129UbuntuSimpleFlow: 2
TestTinkerbellKubernetes130UbuntuSimpleFlow: 2
TestTinkerbellKubernetes131UbuntuSimpleFlow: 2
TestTinkerbellKubernetes126Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes127Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes129Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes129Ubuntu2204RTOSSimpleFlow: 2
TestTinkerbellKubernetes129Ubuntu2204GenericSimpleFlow: 2
TestTinkerbellKubernetes130Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes131Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes126RedHatSimpleFlow: 2
TestTinkerbellKubernetes127RedHatSimpleFlow: 2
TestTinkerbellKubernetes128RedHatSimpleFlow: 2
TestTinkerbellKubernetes129RedHatSimpleFlow: 2
TestTinkerbellKubernetes130RedHatSimpleFlow: 2
TestTinkerbellKubernetes131RedHatSimpleFlow: 2
TestTinkerbellKubernetes126RedHat9SimpleFlow: 2
TestTinkerbellKubernetes127RedHat9SimpleFlow: 2
TestTinkerbellKubernetes128RedHat9SimpleFlow: 2
TestTinkerbellKubernetes129RedHat9SimpleFlow: 2
TestTinkerbellKubernetes130RedHat9SimpleFlow: 2
TestTinkerbellKubernetes131RedHat9SimpleFlow: 2
TestTinkerbellKubernetes126BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes127BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes128BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes131UbuntuThreeControlPlaneReplicasSimpleFlow: 4
Expand All @@ -123,19 +105,17 @@ TestTinkerbellK8sUpgrade130to131WithUbuntuOOB: 4
TestTinkerbellKubernetes130UbuntuTo131UpgradeCPOnly: 3
TestTinkerbellKubernetes130UbuntuTo131UpgradeWorkerOnly: 3
TestTinkerbellSingleNode130To131UbuntuManagementCPUpgradeAPI: 4
TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker: 3
TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker: 4
TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellKubernetes129UbuntuTo130InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellKubernetes130UbuntuTo131InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes129UbuntuTo130SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes130UbuntuTo131SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes131UbuntuTo131SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes128UpgradeManagementComponents: 2
TestTinkerbellKubernetes126UbuntuTo131MultipleUpgrade: 4
TestTinkerbellKubernetes127UbuntuTo131MultipleUpgrade: 4
TestTinkerbellKubernetes131UbuntuAddWorkerNodeGroupWithAPI: 2
TestTinkerbellKubernetes129KubeletConfigurationSimpleFlow: 2
TestTinkerbellKubernetes130KubeletConfigurationSimpleFlow: 2
Expand Down
Loading

0 comments on commit deba3d8

Please sign in to comment.