Skip to content

Commit

Permalink
Add 1.32 conformance tests (#9296)
Browse files Browse the repository at this point in the history
  • Loading branch information
@2ez4szliu
2ez4szliu authored Feb 25, 2025
1 parent 58a6aa5 commit c078663
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 49 deletions.
30 changes: 10 additions & 20 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 @@ -12,30 +12,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_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_1_30: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-30"
T_VSPHERE_TEMPLATE_UBUNTU_1_31: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-31"
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_1_32: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-32"
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_UBUNTU_2204_1_30: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-30"
T_VSPHERE_TEMPLATE_UBUNTU_2204_1_31: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-31"
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_UBUNTU_2204_1_32: "/SDDC-Datacenter/vm/Templates/ubuntu-2204-kube-v1-32"
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_BR_1_30: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-30"
T_VSPHERE_TEMPLATE_BR_1_31: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-31"
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_BR_1_32: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-32"
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_VSPHERE_TEMPLATE_REDHAT_1_31: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-31"
T_VSPHERE_TEMPLATE_REDHAT_1_32: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-32"
T_NUTANIX_MACHINE_VCPU_PER_SOCKET: 1
T_NUTANIX_MACHINE_VCPU_SOCKET: 2
T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi"
Expand Down Expand Up @@ -84,24 +80,21 @@ 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_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_1_32: "tinkerbell_ci:image_ubuntu_1_32"
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_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_UBUNTU_2204_1_32: "tinkerbell_ci:image_ubuntu_2204_1_32"
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_1_32: "tinkerbell_ci:image_redhat_1_32"
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 All @@ -126,24 +119,21 @@ env:
T_NUTANIX_POD_CIDR: "nutanix_ci:nutanix_pod_cidr"
T_NUTANIX_SERVICE_CIDR: "nutanix_ci:nutanix_service_cidr"
T_NUTANIX_ADDITIONAL_TRUST_BUNDLE: "nutanix_ci:nutanix_additional_trust_bundle"
T_NUTANIX_TEMPLATE_NAME_UBUNTU_1_26: "nutanix_ci:nutanix_template_ubuntu_1_26"
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_UBUNTU_1_31: "nutanix_ci:nutanix_template_ubuntu_1_31"
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_UBUNTU_1_32: "nutanix_ci:nutanix_template_ubuntu_1_32"
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_1_31: "nutanix_ci:nutanix_template_rhel_8_1_31"
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_1_32: "nutanix_ci:nutanix_template_rhel_8_1_32"
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"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_31: "nutanix_ci:nutanix_template_rhel_9_1_31"
T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_32: "nutanix_ci:nutanix_template_rhel_9_1_32"
LICENSE_TOKEN: "extended_support:license_token"
LICENSE_TOKEN2: "extended_support:license_token2"

Expand Down
58 changes: 29 additions & 29 deletions test/e2e/conformance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@ func runTinkerbellConformanceFlow(test *framework.ClusterE2ETest) {
test.ValidateHardwareDecommissioned()
}

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

func TestDockerKubernetes128ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
Expand Down Expand Up @@ -79,11 +69,11 @@ func TestDockerKubernetes131ThreeWorkersConformanceFlow(t *testing.T) {
runConformanceFlow(test)
}

func TestVSphereKubernetes127ThreeWorkersConformanceFlow(t *testing.T) {
func TestDockerKubernetes132ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewVSphere(t, framework.WithUbuntu127()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.NewDocker(t),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube132)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
Expand Down Expand Up @@ -129,11 +119,11 @@ func TestVSphereKubernetes131ThreeWorkersConformanceFlow(t *testing.T) {
runConformanceFlow(test)
}

func TestVSphereKubernetes127BottleRocketThreeWorkersConformanceFlow(t *testing.T) {
func TestVSphereKubernetes132ThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewVSphere(t, framework.WithBottleRocket127()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.NewVSphere(t, framework.WithUbuntu132()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube132)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runConformanceFlow(test)
Expand Down Expand Up @@ -179,17 +169,14 @@ func TestVSphereKubernetes131BottleRocketThreeWorkersConformanceFlow(t *testing.
runConformanceFlow(test)
}

func TestTinkerbellKubernetes127ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
func TestVSphereKubernetes132BottleRocketThreeWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewTinkerbell(t, framework.WithUbuntu127Tinkerbell()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.WithClusterFiller(api.WithWorkerNodeCount(2)),
framework.WithClusterFiller(api.WithControlPlaneCount(3)),
framework.WithControlPlaneHardware(3),
framework.WithWorkerHardware(2),
framework.NewVSphere(t, framework.WithBottleRocket132()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube132)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
)
runTinkerbellConformanceFlow(test)
runConformanceFlow(test)
}

func TestTinkerbellKubernetes128ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
Expand Down Expand Up @@ -244,14 +231,17 @@ func TestTinkerbellKubernetes131ThreeReplicasTwoWorkersConformanceFlow(t *testin
runTinkerbellConformanceFlow(test)
}

func TestNutanixKubernetes127ThreeWorkersConformanceFlow(t *testing.T) {
func TestTinkerbellKubernetes132ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewNutanix(t, framework.WithUbuntu127Nutanix()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)),
framework.WithClusterFiller(api.WithWorkerNodeCount(3)),
framework.NewTinkerbell(t, framework.WithUbuntu132Tinkerbell()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube132)),
framework.WithClusterFiller(api.WithWorkerNodeCount(2)),
framework.WithClusterFiller(api.WithControlPlaneCount(3)),
framework.WithControlPlaneHardware(3),
framework.WithWorkerHardware(2),
)
runConformanceFlow(test)
runTinkerbellConformanceFlow(test)
}

func TestNutanixKubernetes128ThreeWorkersConformanceFlow(t *testing.T) {
Expand Down Expand Up @@ -293,3 +283,13 @@ func TestNutanixKubernetes131ThreeWorkersConformanceFlow(t *testing.T) {
)
runConformanceFlow(test)
}

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

0 comments on commit c078663

Please sign in to comment.