Skip to content

Commit cb875e8

Browse files
sp1999sp1999
authored
Fix e2e tests (#9721)
* Fix upgrade from latest and upgrade management components e2e tests * Adding missing tinkerbell tests and fix missing license token e2e test failures
1 parent 296f814 commit cb875e8

File tree

7 files changed

+271
-48
lines changed

7 files changed

+271
-48
lines changed

‎test/e2e/SKIPPED_TESTS.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ skipped_tests:
3232
- TestTinkerbellKubernetes132UbuntuAddWorkerNodeGroupWithAPI
3333
# 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
3434
# Skipping a few redundant tests
35-
# For RHEL 9 Tinkerbell tests, only enable test case for latest kubernetes version 1.31 due to limited testing resources.
35+
# For Ubuntu 22.04, RHEL 8 and RHEL 9 Tinkerbell tests, only enable test case for latest kubernetes version 1.32 due to limited testing resources.
3636
- TestTinkerbellKubernetes128RedHatSimpleFlow
3737
- TestTinkerbellKubernetes129RedHatSimpleFlow
3838
- TestTinkerbellKubernetes130RedHatSimpleFlow
39-
- TestTinkerbellKubernetes132RedHatSimpleFlow
39+
- TestTinkerbellKubernetes131RedHatSimpleFlow
4040
- TestTinkerbellKubernetes128RedHat9SimpleFlow
4141
- TestTinkerbellKubernetes129RedHat9SimpleFlow
4242
- TestTinkerbellKubernetes130RedHat9SimpleFlow
43+
- TestTinkerbellKubernetes131RedHat9SimpleFlow
4344
- TestTinkerbellKubernetes128Ubuntu2204SimpleFlow
4445
- TestTinkerbellKubernetes129Ubuntu2204SimpleFlow
4546
- TestTinkerbellKubernetes130Ubuntu2204SimpleFlow
47+
- TestTinkerbellKubernetes131Ubuntu2204SimpleFlow
4648
- TestTinkerbellKubernetes128To129Ubuntu2204Upgrade
4749
- TestTinkerbellKubernetes129To130Ubuntu2204Upgrade
4850
- TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade
@@ -61,9 +63,11 @@ skipped_tests:
6163
- TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesHarborFlow
6264
- TestTinkerbellKubernetes128UbuntuCuratedPackagesAdotSimpleFlow
6365
- TestTinkerbellKubernetes128UbuntuCuratedPackagesPrometheusSimpleFlow
66+
- TestTinkerbellKubernetes128UbuntuCuratedPackagesClusterAutoscalerSimpleFlow
6467

6568
# Tinkerbell conformance
6669
- TestTinkerbellKubernetes128ThreeReplicasTwoWorkersConformanceFlow
6770
- TestTinkerbellKubernetes129ThreeReplicasTwoWorkersConformanceFlow
6871
- TestTinkerbellKubernetes130ThreeReplicasTwoWorkersConformanceFlow
6972
- TestTinkerbellKubernetes131ThreeReplicasTwoWorkersConformanceFlow
73+
- TestTinkerbellKubernetes132ThreeReplicasTwoWorkersConformanceFlow

‎test/e2e/TINKERBELL_HARDWARE_COUNT.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ TestTinkerbellKubernetes128UbuntuTo129Upgrade: 4
3636
TestTinkerbellKubernetes129UbuntuTo130Upgrade: 4
3737
TestTinkerbellKubernetes130UbuntuTo131Upgrade: 4
3838
TestTinkerbellKubernetes131UbuntuTo132Upgrade: 4
39-
TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4
4039
TestTinkerbellKubernetes128To129Ubuntu2204RTOSUpgrade: 4
4140
TestTinkerbellKubernetes128To129Ubuntu2204GenericUpgrade: 4
41+
TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4
4242
TestTinkerbellKubernetes129To130Ubuntu2204Upgrade: 4
4343
TestTinkerbellKubernetes130To131Ubuntu2204Upgrade: 4
4444
TestTinkerbellKubernetes131To132Ubuntu2204Upgrade: 4
@@ -61,9 +61,13 @@ TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2
6161
TestTinkerbellKubernetes128UbuntuSimpleFlow: 2
6262
TestTinkerbellKubernetes129UbuntuSimpleFlow: 2
6363
TestTinkerbellKubernetes130UbuntuSimpleFlow: 2
64+
TestTinkerbellKubernetes131UbuntuSimpleFlow: 2
6465
TestTinkerbellKubernetes132UbuntuSimpleFlow: 2
6566
TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2
6667
TestTinkerbellKubernetes129Ubuntu2204SimpleFlow: 2
68+
TestTinkerbellKubernetes130Ubuntu2204SimpleFlow: 2
69+
TestTinkerbellKubernetes131Ubuntu2204SimpleFlow: 2
70+
TestTinkerbellKubernetes132Ubuntu2204SimpleFlow: 2
6771
TestTinkerbellKubernetes129Ubuntu2204RTOSSimpleFlow: 2
6872
TestTinkerbellKubernetes130Ubuntu2204RTOSSimpleFlow: 2
6973
TestTinkerbellKubernetes131Ubuntu2204RTOSSimpleFlow: 2
@@ -72,15 +76,16 @@ TestTinkerbellKubernetes129Ubuntu2204GenericSimpleFlow: 2
7276
TestTinkerbellKubernetes130Ubuntu2204GenericSimpleFlow: 2
7377
TestTinkerbellKubernetes131Ubuntu2204GenericSimpleFlow: 2
7478
TestTinkerbellKubernetes132Ubuntu2204GenericSimpleFlow: 2
75-
TestTinkerbellKubernetes130Ubuntu2204SimpleFlow: 2
76-
TestTinkerbellKubernetes132Ubuntu2204SimpleFlow: 2
7779
TestTinkerbellKubernetes128RedHatSimpleFlow: 2
7880
TestTinkerbellKubernetes129RedHatSimpleFlow: 2
7981
TestTinkerbellKubernetes130RedHatSimpleFlow: 2
82+
TestTinkerbellKubernetes131RedHatSimpleFlow: 2
83+
TestTinkerbellKubernetes132RedHatSimpleFlow: 2
8084
TestTinkerbellKubernetes132RedHatSimpleFlow: 2
8185
TestTinkerbellKubernetes128RedHat9SimpleFlow: 2
8286
TestTinkerbellKubernetes129RedHat9SimpleFlow: 2
8387
TestTinkerbellKubernetes130RedHat9SimpleFlow: 2
88+
TestTinkerbellKubernetes131RedHat9SimpleFlow: 2
8489
TestTinkerbellKubernetes132RedHat9SimpleFlow: 2
8590
TestTinkerbellKubernetes128BottleRocketSimpleFlow: 2
8691
TestTinkerbellKubernetes132UbuntuThreeControlPlaneReplicasSimpleFlow: 4

‎test/e2e/docker_test.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ func TestDockerKubernetes131To132ExternalEtcdUpgrade(t *testing.T) {
850850

851851
// Upgrade From Latest Minor Release
852852
func TestDockerKubernetes128to129UpgradeFromLatestMinorRelease(t *testing.T) {
853+
licenseToken := framework.GetLicenseToken()
853854
release := latestMinorRelease(t)
854855
provider := framework.NewDocker(t)
855856
test := framework.NewClusterE2ETest(
@@ -864,11 +865,15 @@ func TestDockerKubernetes128to129UpgradeFromLatestMinorRelease(t *testing.T) {
864865
test,
865866
release,
866867
v1alpha1.Kube129,
867-
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)),
868+
framework.WithClusterUpgrade(
869+
api.WithKubernetesVersion(v1alpha1.Kube129),
870+
api.WithLicenseToken(licenseToken),
871+
),
868872
)
869873
}
870874

871875
func TestDockerKubernetes129to130UpgradeFromLatestMinorRelease(t *testing.T) {
876+
licenseToken := framework.GetLicenseToken()
872877
release := latestMinorRelease(t)
873878
provider := framework.NewDocker(t)
874879
test := framework.NewClusterE2ETest(
@@ -883,11 +888,15 @@ func TestDockerKubernetes129to130UpgradeFromLatestMinorRelease(t *testing.T) {
883888
test,
884889
release,
885890
v1alpha1.Kube130,
886-
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)),
891+
framework.WithClusterUpgrade(
892+
api.WithKubernetesVersion(v1alpha1.Kube130),
893+
api.WithLicenseToken(licenseToken),
894+
),
887895
)
888896
}
889897

890898
func TestDockerKubernetes130to131UpgradeFromLatestMinorRelease(t *testing.T) {
899+
licenseToken := framework.GetLicenseToken()
891900
release := latestMinorRelease(t)
892901
provider := framework.NewDocker(t)
893902
test := framework.NewClusterE2ETest(
@@ -902,11 +911,15 @@ func TestDockerKubernetes130to131UpgradeFromLatestMinorRelease(t *testing.T) {
902911
test,
903912
release,
904913
v1alpha1.Kube131,
905-
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube131)),
914+
framework.WithClusterUpgrade(
915+
api.WithKubernetesVersion(v1alpha1.Kube131),
916+
api.WithLicenseToken(licenseToken),
917+
),
906918
)
907919
}
908920

909921
func TestDockerKubernetes131to132UpgradeFromLatestMinorRelease(t *testing.T) {
922+
licenseToken := framework.GetLicenseToken()
910923
release := latestMinorRelease(t)
911924
provider := framework.NewDocker(t)
912925
test := framework.NewClusterE2ETest(
@@ -921,7 +934,10 @@ func TestDockerKubernetes131to132UpgradeFromLatestMinorRelease(t *testing.T) {
921934
test,
922935
release,
923936
v1alpha1.Kube132,
924-
framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube132)),
937+
framework.WithClusterUpgrade(
938+
api.WithKubernetesVersion(v1alpha1.Kube132),
939+
api.WithLicenseToken(licenseToken),
940+
),
925941
)
926942
}
927943

0 commit comments

Comments
 (0)