diff --git a/test/e2e/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml index 6ebc787602ec..58242a1349f5 100644 --- a/test/e2e/SKIPPED_TESTS.yaml +++ b/test/e2e/SKIPPED_TESTS.yaml @@ -20,11 +20,13 @@ skipped_tests: - TestCloudStackKubernetes125MultiEndpointSimpleFlow - TestCloudStackKubernetes126MultiEndpointSimpleFlow - TestCloudStackKubernetes127MultiEndpointSimpleFlow +- TestCloudStackKubernetes128MultiEndpointSimpleFlow # These tests will fail until there is a new latest minor release version as 16.2 has a preflight check to prevent k8s version > 1.24 - TestCloudStackKubernetes125WithOIDCManagementClusterUpgradeFromLatestSideEffects - TestCloudStackKubernetes126WithOIDCManagementClusterUpgradeFromLatestSideEffects - TestCloudStackKubernetes127WithOIDCManagementClusterUpgradeFromLatestSideEffects +- TestCloudStackKubernetes128WithOIDCManagementClusterUpgradeFromLatestSideEffects # Proxy tests - TestCloudStackKubernetes123RedhatProxyConfigAPI @@ -32,6 +34,7 @@ skipped_tests: - TestCloudStackKubernetes125RedhatProxyConfigAPI - TestCloudStackKubernetes126RedhatProxyConfigAPI - TestCloudStackKubernetes127RedhatProxyConfigAPI +- TestCloudStackKubernetes128RedhatProxyConfigAPI # Nutanix @@ -70,12 +73,13 @@ skipped_tests: - TestTinkerbellUpgrade125MulticlusterWorkloadClusterWorkerScaleupWithAPI - TestTinkerbellUpgrade126MulticlusterWorkloadClusterWorkerScaleupWithFluxAPI - TestTinkerbellUpgrade127MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI +- TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI # Skipping ETCD 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 -- TestTinkerbellKubernetes127SkipPowerActions -- TestTinkerbellKubernetes127BottlerocketWorkloadClusterSkipPowerActions -- TestTinkerbellKubernetes127WithNodesPoweredOn +- TestTinkerbellKubernetes128SkipPowerActions +- TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions +- TestTinkerbellKubernetes128WithNodesPoweredOn # Skipping a few redundant tests - TestTinkerbellKubernetes123RedHatSimpleFlow - TestTinkerbellKubernetes124RedHatSimpleFlow @@ -99,14 +103,14 @@ skipped_tests: - TestTinkerbellKubernetes126UbuntuThreeWorkersSimpleFlow - TestTinkerbellAirgappedKubernetes126BottleRocketRegistryMirror - TestTinkerbellKubernetes124UbuntuTo125Upgrade -- TestTinkerbellKubernetes127SkipPowerActions -- TestTinkerbellKubernetes127SingleNodeSkipPowerActions +- TestTinkerbellKubernetes128SkipPowerActions +- TestTinkerbellKubernetes128SingleNodeSkipPowerActions - TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI - TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI - TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI - TestTinkerbellKubernetes125BottleRocketSimpleFlow # Tinkerbell Packages -# Skip test cases for packages other than hello-eks-anywhere and not for K 1.27. +# Skip test cases for packages other than hello-eks-anywhere and not for K 1.28. - TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesEmissaryFlow - TestTinkerbellKubernetes126BottleRocketSingleNodeCuratedPackagesEmissaryFlow - TestTinkerbellKubernetes126UbuntuSingleNodeCuratedPackagesHarborFlow @@ -131,13 +135,22 @@ skipped_tests: - TestTinkerbellKubernetes124BottleRocketCuratedPackagesAdotSimpleFlow - TestTinkerbellKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow - TestTinkerbellKubernetes124BottleRocketCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes123UbuntuSingleNodeCuratedPackagesEmissaryFlow -- TestTinkerbellKubernetes123BottleRocketSingleNodeCuratedPackagesEmissaryFlow -- TestTinkerbellKubernetes123UbuntuSingleNodeCuratedPackagesHarborFlow -- TestTinkerbellKubernetes123BottleRocketSingleNodeCuratedPackagesHarborFlow -- TestTinkerbellKubernetes123UbuntuCuratedPackagesAdotSimpleFlow -- TestTinkerbellKubernetes123BottleRocketCuratedPackagesAdotSimpleFlow -- TestTinkerbellKubernetes123UbuntuCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes123BottleRocketCuratedPackagesPrometheusSimpleFlow +- TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesEmissaryFlow +- TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesEmissaryFlow +- TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow +- TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesHarborFlow +- TestTinkerbellKubernetes127UbuntuCuratedPackagesAdotSimpleFlow +- TestTinkerbellKubernetes127BottleRocketCuratedPackagesAdotSimpleFlow +- TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow +- TestTinkerbellKubernetes127BottleRocketCuratedPackagesPrometheusSimpleFlow # Conformance - TestSnowKubernetes123ThreeWorkersConformanceFlow + +# 127to128FromLatestMinorRelease will fail until there is a new patch release using a newer packages controller +# Remove these once v0.17.4 is out +- TestDockerKubernetes127to128UpgradeFromLatestMinorRelease +- TestDockerKubernetes127to128GithubFluxEnabledUpgradeFromLatestMinorRelease +- TestDockerKubernetes127to128UpgradeFromLatestMinorReleaseAPI +- TestVSphereKubernetes127To128UbuntuUpgradeFromLatestMinorRelease +- TestVSphereKubernetes127To128RedhatUpgradeFromLatestMinorRelease +- TestVSphereKubernetes127to128UpgradeFromLatestMinorReleaseBottleRocketAPI \ No newline at end of file diff --git a/test/e2e/vsphere_test.go b/test/e2e/vsphere_test.go index b9e30168bb46..fc40000e17ca 100644 --- a/test/e2e/vsphere_test.go +++ b/test/e2e/vsphere_test.go @@ -2186,7 +2186,7 @@ func TestVSphereKubernetes128Ubuntu2004To2204Upgrade(t *testing.T) { } func TestVSphereKubernetes127UbuntuTo128UpgradeCiliumPolicyEnforcementMode(t *testing.T) { - provider := framework.NewVSphere(t, framework.WithUbuntu126()) + provider := framework.NewVSphere(t, framework.WithUbuntu127()) test := framework.NewClusterE2ETest( t, provider, @@ -2205,7 +2205,7 @@ func TestVSphereKubernetes127UbuntuTo128UpgradeCiliumPolicyEnforcementMode(t *te } func TestVSphereKubernetes127UbuntuTo128MultipleFieldsUpgrade(t *testing.T) { - provider := framework.NewVSphere(t, framework.WithUbuntu126()) + provider := framework.NewVSphere(t, framework.WithUbuntu127()) test := framework.NewClusterE2ETest( t, provider, diff --git a/test/framework/nutanix.go b/test/framework/nutanix.go index b620e20a8afc..58bd9977aea6 100644 --- a/test/framework/nutanix.go +++ b/test/framework/nutanix.go @@ -62,6 +62,7 @@ var requiredNutanixEnvVars = []string{ nutanixTemplateNameUbuntu125Var, nutanixTemplateNameUbuntu126Var, nutanixTemplateNameUbuntu127Var, + nutanixTemplateNameUbuntu128Var, nutanixInsecure, } diff --git a/test/framework/tinkerbell.go b/test/framework/tinkerbell.go index 68d095ea4e0a..b69888c1b401 100644 --- a/test/framework/tinkerbell.go +++ b/test/framework/tinkerbell.go @@ -16,19 +16,16 @@ const ( tinkerbellProviderName = "tinkerbell" tinkerbellBootstrapIPEnvVar = "T_TINKERBELL_BOOTSTRAP_IP" tinkerbellControlPlaneNetworkCidrEnvVar = "T_TINKERBELL_CP_NETWORK_CIDR" - tinkerbellImageUbuntu123EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_23" tinkerbellImageUbuntu124EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_24" tinkerbellImageUbuntu125EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_25" tinkerbellImageUbuntu126EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_26" tinkerbellImageUbuntu127EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_27" tinkerbellImageUbuntu128EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_28" - tinkerbellImageUbuntu2204Kubernetes123EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_23" tinkerbellImageUbuntu2204Kubernetes124EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_24" tinkerbellImageUbuntu2204Kubernetes125EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_25" tinkerbellImageUbuntu2204Kubernetes126EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_26" tinkerbellImageUbuntu2204Kubernetes127EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_27" tinkerbellImageUbuntu2204Kubernetes128EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_28" - tinkerbellImageRedHat123EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_23" tinkerbellImageRedHat124EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_24" tinkerbellImageRedHat125EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_25" tinkerbellImageRedHat126EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_26" @@ -41,17 +38,14 @@ const ( var requiredTinkerbellEnvVars = []string{ tinkerbellControlPlaneNetworkCidrEnvVar, - tinkerbellImageUbuntu123EnvVar, tinkerbellImageUbuntu124EnvVar, tinkerbellImageUbuntu125EnvVar, tinkerbellImageUbuntu126EnvVar, tinkerbellImageUbuntu127EnvVar, - tinkerbellImageUbuntu2204Kubernetes123EnvVar, tinkerbellImageUbuntu2204Kubernetes124EnvVar, tinkerbellImageUbuntu2204Kubernetes125EnvVar, tinkerbellImageUbuntu2204Kubernetes126EnvVar, tinkerbellImageUbuntu2204Kubernetes127EnvVar, - tinkerbellImageRedHat123EnvVar, tinkerbellImageRedHat124EnvVar, tinkerbellImageRedHat125EnvVar, tinkerbellImageRedHat126EnvVar, @@ -180,11 +174,6 @@ func withKubeVersionAndOS(kubeVersion anywherev1.KubernetesVersion, os OS, relea } } -// WithUbuntu123Tinkerbell tink test with ubuntu 1.23. -func WithUbuntu123Tinkerbell() TinkerbellOpt { - return withKubeVersionAndOS(anywherev1.Kube123, Ubuntu2004, nil) -} - // WithUbuntu124Tinkerbell tink test with ubuntu 1.24. func WithUbuntu124Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube124, Ubuntu2004, nil) @@ -210,11 +199,6 @@ func WithUbuntu128Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, nil) } -// WithRedHat123Tinkerbell tink test with redhat 1.23. -func WithRedHat123Tinkerbell() TinkerbellOpt { - return withKubeVersionAndOS(anywherev1.Kube123, RedHat8, nil) -} - // WithRedHat124Tinkerbell tink test with redhat 1.24. func WithRedHat124Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube124, RedHat8, nil) @@ -288,11 +272,6 @@ func imageForKubeVersionAndOS(kubeVersion anywherev1.KubernetesVersion, operatin return api.WithTinkerbellOSImageURL(os.Getenv(envVarForImage(operatingSystem, kubeVersion))) } -// Ubuntu123Image represents an Ubuntu raw image corresponding to Kubernetes 1.23. -func Ubuntu123Image() api.TinkerbellFiller { - return imageForKubeVersionAndOS(anywherev1.Kube123, Ubuntu2004) -} - // Ubuntu124Image represents an Ubuntu raw image corresponding to Kubernetes 1.24. func Ubuntu124Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube124, Ubuntu2004)