From 316a703acea5d2f86cfc2e940b3e1e8d0cec8bd8 Mon Sep 17 00:00:00 2001 From: Guillermo Gaston Date: Tue, 15 Nov 2022 11:45:48 -0600 Subject: [PATCH] Update vsphere template envvar in conformance test (#4069) --- .../buildspecs/conformance-eks-a-cli.yml | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml index 3b4b2001fe30..1db2720b0313 100644 --- a/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml @@ -10,6 +10,21 @@ env: TEST_RUNNER_GOVC_LIBRARY: "eks-a-templates" 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_20: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-20" + T_VSPHERE_TEMPLATE_UBUNTU_1_21: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-21" + T_VSPHERE_TEMPLATE_UBUNTU_1_22: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-22" + T_VSPHERE_TEMPLATE_UBUNTU_1_23: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-23" + T_VSPHERE_TEMPLATE_UBUNTU_1_24: "/SDDC-Datacenter/vm/Templates/ubuntu-kube-v1-24" + T_VSPHERE_TEMPLATE_BR_1_20: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-20" + T_VSPHERE_TEMPLATE_BR_1_21: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-21" + T_VSPHERE_TEMPLATE_BR_1_22: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-22" + T_VSPHERE_TEMPLATE_BR_1_23: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-23" + T_VSPHERE_TEMPLATE_BR_1_24: "/SDDC-Datacenter/vm/Templates/bottlerocket-kube-v1-24" + T_VSPHERE_TEMPLATE_REDHAT_1_20: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-20" + T_VSPHERE_TEMPLATE_REDHAT_1_21: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-21" + T_VSPHERE_TEMPLATE_REDHAT_1_22: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-22" + T_VSPHERE_TEMPLATE_REDHAT_1_23: "/SDDC-Datacenter/vm/Templates/redhat-kube-v1-23" secrets-manager: EKSA_VSPHERE_USERNAME: "vsphere_ci_beta_connection:vsphere_username" EKSA_VSPHERE_PASSWORD: "vsphere_ci_beta_connection:vsphere_password" @@ -28,19 +43,6 @@ env: T_VSPHERE_RESOURCE_POOL: "vsphere_ci_beta_connection:resource_pool" T_VSPHERE_SERVER: "vsphere_ci_beta_connection:server" T_VSPHERE_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key" - T_VSPHERE_TEMPLATE_UBUNTU_1_18: "vsphere_ci_beta_connection:template_18" - T_VSPHERE_TEMPLATE_UBUNTU_1_19: "vsphere_ci_beta_connection:template_19" - T_VSPHERE_TEMPLATE_UBUNTU_1_20: "vsphere_ci_beta_connection:template_20" - T_VSPHERE_TEMPLATE_UBUNTU_1_21: "vsphere_ci_beta_connection:template_21" - T_VSPHERE_TEMPLATE_UBUNTU_1_22: "vsphere_ci_beta_connection:template_22" - T_VSPHERE_TEMPLATE_UBUNTU_1_23: "vsphere_ci_beta_connection:template_23" - T_VSPHERE_TEMPLATE_UBUNTU_1_24: "vsphere_ci_beta_connection:template_24" - T_VSPHERE_TEMPLATE_REDHAT_1_23: "vsphere_ci_beta_connection:template_redhat_23" - T_VSPHERE_TEMPLATE_BR_1_20: "vsphere_ci_beta_connection:template_br_20" - T_VSPHERE_TEMPLATE_BR_1_21: "vsphere_ci_beta_connection:template_br_21" - T_VSPHERE_TEMPLATE_BR_1_22: "vsphere_ci_beta_connection:template_br_22" - T_VSPHERE_TEMPLATE_BR_1_23: "vsphere_ci_beta_connection:template_br_23" - T_VSPHERE_TEMPLATE_BR_1_24: "vsphere_ci_beta_connection:template_br_24" T_VSPHERE_TLS_INSECURE: "vsphere_ci_beta_connection:tls_insecure" T_VSPHERE_TLS_THUMBPRINT: "vsphere_ci_beta_connection:tls_thumbprint" T_TINKERBELL_IMAGE_UBUNTU_1_20: "tinkerbell_ci:image_ubuntu_1_20"