Skip to content

Commit

Permalink
Add 1.29 E2E for Tinkerbell (#8169)
Browse files Browse the repository at this point in the history
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
Co-authored-by: Rahul Ganesh <rahulgab@amazon.com>
  • Loading branch information
rahulbabu95 and Rahul Ganesh authored May 21, 2024
1 parent e521575 commit 4b49215
Show file tree
Hide file tree
Showing 7 changed files with 354 additions and 298 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,21 @@ env:
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_2204_1_24: "tinkerbell_ci:image_ubuntu_2204_1_24"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_25: "tinkerbell_ci:image_ubuntu_2204_1_25"
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_30: "tinkerbell_ci:image_ubuntu_2204_1_30"
T_TINKERBELL_IMAGE_REDHAT_1_24: "tinkerbell_ci:image_redhat_1_24"
T_TINKERBELL_IMAGE_REDHAT_1_25: "tinkerbell_ci:image_redhat_1_25"
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_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key"
T_TINKERBELL_CP_NETWORK_CIDR: "tinkerbell_ci:cp_network_cidr"
T_TINKERBELL_S3_INVENTORY_CSV_KEY: "tinkerbell_ci:s3_inventory_csv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,21 @@ env:
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_2204_1_24: "tinkerbell_ci:image_ubuntu_2204_1_24"
T_TINKERBELL_IMAGE_UBUNTU_2204_1_25: "tinkerbell_ci:image_ubuntu_2204_1_25"
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_30: "tinkerbell_ci:image_ubuntu_2204_1_30"
T_TINKERBELL_IMAGE_REDHAT_1_24: "tinkerbell_ci:image_redhat_1_24"
T_TINKERBELL_IMAGE_REDHAT_1_25: "tinkerbell_ci:image_redhat_1_25"
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_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key"
T_TINKERBELL_CP_NETWORK_CIDR: "tinkerbell_ci:cp_network_cidr"
T_TINKERBELL_S3_INVENTORY_CSV_KEY: "tinkerbell_ci:s3_inventory_csv"
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/QUICK_TESTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ quick_tests:
# - TestSnowKubernetes128SimpleFlow
# - TestSnowKubernetes128StackedEtcdSimpleFlow
# Tinkerbell
- ^TestTinkerbellKubernetes128UbuntuTo129Upgrade$
- TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes128To129Ubuntu2204Upgrade
- ^TestTinkerbellKubernetes129UbuntuTo130Upgrade$
- TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes129To130Ubuntu2204Upgrade
23 changes: 11 additions & 12 deletions test/e2e/SKIPPED_TESTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,18 @@ skipped_tests:
- TestTinkerbellKubernetes126UbuntuExternalEtcdSimpleFlow
# 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
- TestTinkerbellKubernetes125RedHatSimpleFlow
- TestTinkerbellKubernetes126RedHatSimpleFlow
- TestTinkerbellKubernetes127RedHatSimpleFlow
- TestTinkerbellKubernetes128RedHatSimpleFlow
- TestTinkerbellKubernetes129RedHatSimpleFlow
- TestTinkerbellKubernetes125UbuntuSimpleFlow
- TestTinkerbellKubernetes130RedHatSimpleFlow
- TestTinkerbellKubernetes126UbuntuSimpleFlow
- TestTinkerbellKubernetes125Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes127UbuntuSimpleFlow
- TestTinkerbellKubernetes126Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes125To126Ubuntu2204Upgrade
- TestTinkerbellKubernetes127Ubuntu2204SimpleFlow
- TestTinkerbellKubernetes126To127Ubuntu2204Upgrade
- TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes126UbuntuThreeWorkersSimpleFlow
- TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI
- TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade
- TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI
- TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI
#Skip single K8s version upgrade tests as the same is covered by multiple K8s version upgrade from 1.25 to 1.29 to save on hardware resources and running time
Expand All @@ -111,12 +110,12 @@ skipped_tests:
- TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow
- TestTinkerbellKubernetes127UbuntuCuratedPackagesAdotSimpleFlow
- TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow
- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow
- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow
- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow
- TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow
- TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow
- TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow
- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesFlow
- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesEmissaryFlow
- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesHarborFlow
- TestTinkerbellKubernetes130UbuntuCuratedPackagesAdotSimpleFlow
- TestTinkerbellKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow
- TestTinkerbellKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow

# Tinkerbell conformance
- TestTinkerbellKubernetes125BottleRocketThreeReplicasTwoWorkersConformanceFlow
Expand Down
87 changes: 44 additions & 43 deletions test/e2e/TINKERBELL_HARDWARE_COUNT.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TestTinkerbellKubernetes129AWSIamAuth: 2
TestTinkerbellKubernetes130AWSIamAuth: 2
TestTinkerbellKubernetes128BottleRocketAWSIamAuth: 2
TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade: 3
TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUpWithAPI: 3
TestTinkerbellKubernetes130UbuntuWorkerNodeUpgrade: 3
TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUpWithAPI: 3
TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI: 2
TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesFlow: 1
Expand Down Expand Up @@ -34,97 +34,98 @@ TestTinkerbellKubernetes125UbuntuCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes125BottleRocketCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesFlow: 1
TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1
TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1
TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesEmissaryFlow: 1
TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow: 1
TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesHarborFlow: 1
TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesHarborFlow: 1
TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes130UbuntuCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes128BottleRocketCuratedPackagesAdotSimpleFlow: 1
TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes128BottleRocketCuratedPackagesPrometheusSimpleFlow: 1
TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3
TestTinkerbellKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3
TestTinkerbellKubernetes128BottleRocketSingleNodeSimpleFlow: 1
TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow: 1
TestTinkerbellKubernetes129UbuntuWorkloadCluster: 4
TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI: 4
TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI: 4
TestTinkerbellKubernetes130UbuntuSingleNodeSimpleFlow: 1
TestTinkerbellKubernetes130UbuntuWorkloadCluster: 4
TestTinkerbellKubernetes130UbuntuWorkloadClusterWithAPI: 4
TestTinkerbellKubernetes130UbuntuWorkloadClusterGitFluxWithAPI: 4
TestTinkerbellKubernetes128BottlerocketWorkloadClusterSimpleFlow: 4
TestTinkerbellKubernetes128BottlerocketWorkloadClusterWithAPI: 4
TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster: 2
TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI: 2
TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadCluster: 2
TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadClusterWithAPI: 2
TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadCluster: 2
TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadClusterWithAPI: 2
TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions: 4
TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleup: 5
TestTinkerbellUpgrade130MulticlusterWorkloadClusterWorkerScaleup: 5
TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI: 4
TestTinkerbellKubernetes125UbuntuTo126Upgrade: 4
TestTinkerbellKubernetes126UbuntuTo127Upgrade: 4
TestTinkerbellKubernetes127UbuntuTo128Upgrade: 4
TestTinkerbellKubernetes128UbuntuTo129Upgrade: 4
TestTinkerbellKubernetes125To126Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes129UbuntuTo130Upgrade: 4
TestTinkerbellKubernetes126To127Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes127To128Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes129To130Ubuntu2204Upgrade: 4
TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade: 4
TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade: 4
TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4
TestTinkerbellUpgrade129MulticlusterWorkloadClusterCPScaleup: 6
TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade128To129: 6
TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade: 4
TestTinkerbellUpgrade130MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4
TestTinkerbellUpgrade130MulticlusterWorkloadClusterCPScaleup: 6
TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade129To130: 6
TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade125To126WithAPI: 4
TestTinkerbellKubernetes129OIDC: 2
TestTinkerbellKubernetes129UbuntuRegistryMirror: 2
TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror: 2
TestTinkerbellKubernetes130OIDC: 2
TestTinkerbellKubernetes130UbuntuRegistryMirror: 2
TestTinkerbellKubernetes130UbuntuInsecureSkipVerifyRegistryMirror: 2
TestTinkerbellKubernetes128BottlerocketRegistryMirror: 2
TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror: 2
TestTinkerbellKubernetes130UbuntuAuthenticatedRegistryMirror: 2
TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2
TestTinkerbellKubernetes125UbuntuSimpleFlow: 2
TestTinkerbellKubernetes126UbuntuSimpleFlow: 2
TestTinkerbellKubernetes127UbuntuSimpleFlow: 2
TestTinkerbellKubernetes128UbuntuSimpleFlow: 2
TestTinkerbellKubernetes129UbuntuSimpleFlow: 2
TestTinkerbellKubernetes125Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes130UbuntuSimpleFlow: 2
TestTinkerbellKubernetes126Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes127Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes129Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes125RedHatSimpleFlow: 2
TestTinkerbellKubernetes130Ubuntu2204SimpleFlow: 2
TestTinkerbellKubernetes126RedHatSimpleFlow: 2
TestTinkerbellKubernetes127RedHatSimpleFlow: 2
TestTinkerbellKubernetes128RedHatSimpleFlow: 2
TestTinkerbellKubernetes129RedHatSimpleFlow: 2
TestTinkerbellKubernetes130RedHatSimpleFlow: 2
TestTinkerbellKubernetes125BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes126BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes127BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes128BottleRocketSimpleFlow: 2
TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow: 4
TestTinkerbellKubernetes130UbuntuThreeControlPlaneReplicasSimpleFlow: 4
TestTinkerbellKubernetes128BottleRocketThreeControlPlaneReplicasSimpleFlow: 4
TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow: 4
TestTinkerbellKubernetes130UbuntuThreeWorkersSimpleFlow: 4
TestTinkerbellKubernetes128BottleRocketThreeWorkersSimpleFlow: 4
TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp: 4
TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp: 3
TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown: 3
TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown: 4
TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels: 3
TestTinkerbellKubernetes130UbuntuControlPlaneScaleUp: 4
TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUp: 3
TestTinkerbellKubernetes130UbuntuWorkerNodeScaleDown: 3
TestTinkerbellKubernetes130UbuntuControlPlaneScaleDown: 4
TestTinkerbellKubernetes130UbuntuWorkerNodeGroupsTaintsAndLabels: 3
TestTinkerbellKubernetes128BottlerocketWorkerNodeGroupsTaintsAndLabels: 3
TestTinkerbellAirgappedKubernetes128BottleRocketRegistryMirror: 2
TestTinkerbellAirgappedKubernetes128BottlerocketProxyConfigFlow: 2
TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow: 2
TestTinkerbellKubernetes129UbuntuOOB: 2
TestTinkerbellK8sUpgrade128to129WithUbuntuOOB: 4
TestTinkerbellKubernetes128UbuntuTo129UpgradeCPOnly: 3
TestTinkerbellKubernetes127UbuntuTo128UpgradeWorkerOnly: 3
TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI: 4
TestTinkerbellKubernetes125UbuntuTo126InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellAirgappedKubernetes130UbuntuProxyConfigFlow: 2
TestTinkerbellKubernetes130UbuntuOOB: 2
TestTinkerbellK8sUpgrade129to130WithUbuntuOOB: 4
TestTinkerbellKubernetes129UbuntuTo130UpgradeCPOnly: 3
TestTinkerbellKubernetes129UbuntuTo130UpgradeWorkerOnly: 3
TestTinkerbellSingleNode129To130UbuntuManagementCPUpgradeAPI: 4
TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker: 3
TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker: 4
TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes129UbuntuTo130InPlaceUpgrade_1CP_1Worker: 2
TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes129UbuntuTo130SingleNodeInPlaceUpgrade: 1
TestTinkerbellKubernetes128UpgradeManagementComponents: 2
TestTinkerbellKubernetes125UbuntuTo129MultipleUpgrade: 4
Loading

0 comments on commit 4b49215

Please sign in to comment.