Skip to content

Commit

Permalink
Add 1.31 conformance tests (#8749)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sp1999
sp1999 authored Sep 13, 2024
1 parent bbb9d86 commit 5703b82
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 3 deletions.
17 changes: 14 additions & 3 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 @@ -18,21 +18,25 @@ env:
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_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_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_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_NUTANIX_MACHINE_VCPU_PER_SOCKET: 1
T_NUTANIX_MACHINE_VCPU_SOCKET: 2
T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi"
Expand Down Expand Up @@ -85,13 +89,20 @@ 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_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_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_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_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 @@ -116,24 +127,24 @@ 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_25: "nutanix_ci:nutanix_template_ubuntu_1_25"
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_REDHAT_1_25: "nutanix_ci:nutanix_template_rhel_8_1_25"
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_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_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_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"

phases:
pre_build:
Expand Down
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 @@ -79,6 +79,16 @@ func TestDockerKubernetes130ThreeWorkersConformanceFlow(t *testing.T) {
runConformanceFlow(test)
}

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

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

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

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

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

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

func TestTinkerbellKubernetes131ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) {
test := framework.NewClusterE2ETest(
t,
framework.NewTinkerbell(t, framework.WithUbuntu131Tinkerbell()),
framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)),
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 @@ -306,3 +349,13 @@ func TestNutanixKubernetes130ThreeWorkersConformanceFlow(t *testing.T) {
)
runConformanceFlow(test)
}

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

0 comments on commit 5703b82

Please sign in to comment.