Skip to content

Commit

Permalink
Adding 130 conformance tests (#8316)
Browse files Browse the repository at this point in the history 
* Adding 130 conformance tests

Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>

* Fix wrong template being used for the test

Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>

---------

Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
Co-authored-by: Rahul Ganesh <rahulgab@amazon.com>
  • Loading branch information
@rahulbabu95
rahulbabu95 and Rahul Ganesh authored Jun 13, 2024
1 parent 35598c8 commit 1b6b82e
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 7 deletions.
14 changes: 7 additions & 7 deletions cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ env:
TEST_RUNNER_GOVC_TEMPLATE: "eks-a-admin-ci"
INTEGRATION_TEST_INFRA_CONFIG: "/tmp/test-infra.yml"
T_VSPHERE_TEMPLATE_FOLDER: "/SDDC-Datacenter/vm/Templates"
T_VSPHERE_TEMPLATE_UBUNTU_1_25: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-25"
T_VSPHERE_TEMPLATE_UBUNTU_1_26: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-26"
T_VSPHERE_TEMPLATE_UBUNTU_1_27: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-27"
T_VSPHERE_TEMPLATE_UBUNTU_1_28: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-28"
T_VSPHERE_TEMPLATE_UBUNTU_1_29: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-29"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_25: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-25"
T_VSPHERE_TEMPLATE_UBUNTU_1_30: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-30"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_26: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-26"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_27: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-27"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_28: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-28"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_29: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-29"
T_VSPHERE_TEMPLATE_BR_1_25: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-25"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_30: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-30"
T_VSPHERE_TEMPLATE_BR_1_26: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-26"
T_VSPHERE_TEMPLATE_BR_1_27: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-27"
T_VSPHERE_TEMPLATE_BR_1_28: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-28"
T_VSPHERE_TEMPLATE_BR_1_29: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-29"
T_VSPHERE_TEMPLATE_REDHAT_1_25: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-25"
T_VSPHERE_TEMPLATE_BR_1_30: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-30"
T_VSPHERE_TEMPLATE_REDHAT_1_26: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-26"
T_VSPHERE_TEMPLATE_REDHAT_1_27: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-27"
T_VSPHERE_TEMPLATE_REDHAT_1_28: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-28"
T_VSPHERE_TEMPLATE_REDHAT_1_29: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-29"
T_VSPHERE_TEMPLATE_REDHAT_1_30: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-30"
T_NUTANIX_MACHINE_VCPU_PER_SOCKET: 1
T_NUTANIX_MACHINE_VCPU_SOCKET: 2
T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi"
Expand Down Expand Up @@ -81,17 +81,14 @@ env:
T_CLOUDSTACK_POD_CIDR: "cloudstack_ci_beta_connection:pod_cidr"
T_CLOUDSTACK_SERVICE_CIDR: "cloudstack_ci_beta_connection:service_cidr"
T_CLOUDSTACK_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key"
T_TINKERBELL_IMAGE_UBUNTU_1_25: "tinkerbell_ci:image_ubuntu_1_25"
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_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_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"
Expand Down Expand Up @@ -124,16 +121,19 @@ env:
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_27: "nutanix_ci:nutanix_template_ubuntu_1_27"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_28: "nutanix_ci:nutanix_template_ubuntu_1_28"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_29: "nutanix_ci:nutanix_template_ubuntu_1_29"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_30: "nutanix_ci:nutanix_template_ubuntu_1_30"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_25: "nutanix_ci:nutanix_template_rhel_8_1_25"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_26: "nutanix_ci:nutanix_template_rhel_8_1_26"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_27: "nutanix_ci:nutanix_template_rhel_8_1_27"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_28: "nutanix_ci:nutanix_template_rhel_8_1_28"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_29: "nutanix_ci:nutanix_template_rhel_8_1_29"
T_NUTANIX_TEMPLATE_NAME_REDHAT_1_30: "nutanix_ci:nutanix_template_rhel_8_1_30"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_25: "nutanix_ci:nutanix_template_rhel_9_1_25"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_26: "nutanix_ci:nutanix_template_rhel_9_1_26"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_27: "nutanix_ci:nutanix_template_rhel_9_1_27"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_28: "nutanix_ci:nutanix_template_rhel_9_1_28"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_29: "nutanix_ci:nutanix_template_rhel_9_1_29"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_30: "nutanix_ci:nutanix_template_rhel_9_1_30"

phases:
pre_build:
Expand Down
1 change: 1 addition & 0 deletions test/e2e/SKIPPED_TESTS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ skipped_tests:
- TestTinkerbellKubernetes127ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes128ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes129ThreeReplicasTwoWorkersConformanceFlow
- TestTinkerbellKubernetes130ThreeReplicasTwoWorkersConformanceFlow
53 changes: 53 additions & 0 deletions test/e2e/conformance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ func TestDockerKubernetes129ThreeWorkersConformanceFlow(t *testing.T) {
runConformanceFlow(test)
}

func TestDockerKubernetes130ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewDocker(t),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
}

func TestVSphereKubernetes126ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -109,6 +119,16 @@ func TestVSphereKubernetes129ThreeWorkersConformanceFlow(t *testing.T) {
runConformanceFlow(test)
}

func TestVSphereKubernetes130ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewVSphere(t, framework.WithUbuntu130()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
}

func TestVSphereKubernetes126BottleRocketThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -149,6 +169,16 @@ func TestVSphereKubernetes129BottleRocketThreeWorkersConformanceFlow(t *testing.
runConformanceFlow(test)
}

func TestVSphereKubernetes130BottleRocketThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewVSphere(t, framework.WithBottleRocket130()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
}

func TestTinkerbellKubernetes126ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -201,6 +231,19 @@ func TestTinkerbellKubernetes129ThreeReplicasTwoWorkersConformanceFlow(t *testin
runTinkerbellConformanceFlow(test)
}

func TestTinkerbellKubernetes130ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
framework.WithClusterFiller(api.WithWorkerNodeCount(2)),
framework.WithClusterFiller(api.WithControlPlaneCount(3)),
framework.WithControlPlaneHardware(3),
framework.WithWorkerHardware(2),
)
runTinkerbellConformanceFlow(test)
}

func TestTinkerbellKubernetes126BottleRocketThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -253,3 +296,13 @@ func TestNutanixKubernetes129ThreeWorkersConformanceFlow(t *testing.T) {
)
runConformanceFlow(test)
}

func TestNutanixKubernetes130ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu130Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
}

0 comments on commit 1b6b82e

Please sign in to comment.