From a23214f90b007123ed137615ac66b0611b5d5ec5 Mon Sep 17 00:00:00 2001 From: Cavaughn Browne Date: Sat, 10 Feb 2024 19:51:38 +0000 Subject: [PATCH] add tests to quick e2e suite from existing tests --- .../build/buildspecs/quick-test-eks-a-cli.yml | 10 ++++++++++ test/e2e/QUICK_TESTS.yaml | 13 +++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml index 92942c9fdacd4..1e036236b931b 100644 --- a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml @@ -8,7 +8,14 @@ env: EKSA_GIT_PRIVATE_KEY: "/tmp/private-key" INTEGRATION_TEST_INFRA_CONFIG: "/tmp/test-infra.yml" # vsphere variables + 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_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_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_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" # cloudstack variables CLOUDSTACK_PROVIDER: true T_CLOUDSTACK_CIDR: "10.80.214.0/23" @@ -106,14 +113,17 @@ env: 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_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_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" # Snow secrets T_SNOW_DEVICES: "snow_ci:snow_devices" T_SNOW_CREDENTIALS_S3_PATH: "snow_ci:snow_credentials_s3_path" diff --git a/test/e2e/QUICK_TESTS.yaml b/test/e2e/QUICK_TESTS.yaml index a3265ac2bf931..dd8e5bc8ee63a 100644 --- a/test/e2e/QUICK_TESTS.yaml +++ b/test/e2e/QUICK_TESTS.yaml @@ -2,12 +2,21 @@ quick_tests: # Docker - TestDocker.*128 # vSphere -- TestVSphereKubernetes128Ubuntu2204SimpleFlow +- ^TestVSphereKubernetes127UbuntuTo128Upgrade$ +- TestVSphereKubernetes127UbuntuTo128StackedEtcdUpgrade +- TestVSphereKubernetes127To128Ubuntu2204Upgrade +- TestVSphereKubernetes128Ubuntu2004To2204Upgrade +- TestVSphereKubernetes127BottlerocketTo128Upgrade +- TestVSphereKubernetes127BottlerocketTo128StackedEtcdUpgrade # CloudStack - TestCloudStackKubernetes127To128RedhatMultipleFieldsUpgrade # Nutanix -- TestNutanixKubernetes127to128RedHat9Upgrade +- TestNutanixKubernetes128to129RedHat9Upgrade +- TestNutanixKubernetes128to129RedHat8Upgrade +- TestNutanixKubernetes128To129UbuntuUpgrade # Snow - TestSnowKubernetes128SimpleFlow # Tinkerbell # - ^TestTinkerbellKubernetes127UbuntuTo128Upgrade$ +# - TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade +# - TestTinkerbellKubernetes127To128Ubuntu2204Upgrade