From 0d09a663313454bbb50860485684580c83f34735 Mon Sep 17 00:00:00 2001 From: Cavaughn Browne Date: Fri, 9 Feb 2024 16:14:15 +0000 Subject: [PATCH] add one tinkerbell e2e test to the quick test suite (disabled) --- .../build/buildspecs/quick-test-eks-a-cli.yml | 38 ++++++++++++++++++- test/e2e/QUICK_TESTS.yaml | 6 ++- 2 files changed, 40 insertions(+), 4 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 3eeaafac104ef..648ddef356789 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 @@ -18,6 +18,12 @@ env: T_NUTANIX_MACHINE_MEMORY_SIZE: "4Gi" T_NUTANIX_SYSTEMDISK_SIZE: "40Gi" T_NUTANIX_INSECURE: true + # tinkerbell variables + T_TINKERBELL_MAX_HARDWARE_PER_TEST: 4 + T_TINKERBELL_INVENTORY_CSV: "hardware-manifests/inventory.csv" + T_TINKERBELL_BOOTSTRAP_INTERFACE: "ens192" + TEST_RUNNER_GOVC_LIBRARY: "eks-a-templates" + TEST_RUNNER_GOVC_TEMPLATE: "eks-a-admin-ci" secrets-manager: EKSA_AWS_ACCESS_KEY_ID: "packages_ci_beta:aws_access_key_id" EKSA_AWS_SECRET_ACCESS_KEY: "packages_ci_beta:aws_secret_access_key_id" @@ -113,7 +119,35 @@ env: T_SNOW_CREDENTIALS_S3_PATH: "snow_ci:snow_credentials_s3_path" T_SNOW_CERTIFICATES_S3_PATH: "snow_ci:snow_certificates_s3_path" T_SNOW_CONTROL_PLANE_CIDRS: "snow_ci:control_plane_cidrs" - + # Tinkerbell secrets + T_TINKERBELL_IMAGE_UBUNTU_1_24: "tinkerbell_ci:image_ubuntu_1_24" + 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_2204_1_24: "tinkerbell_ci:image_ubuntu_2204_1_24" + 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_REDHAT_1_24: "tinkerbell_ci:image_redhat_1_24" + 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" + 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" + T_TINKERBELL_S3_AG_INVENTORY_CSV_KEY: "tinkerbell_ci:s3_ag_inventory_csv" + BAREMETAL_BRANCH: "tinkerbell_ci:baremetal_branch" + TEST_RUNNER_GOVC_USERNAME: "tinkerbell_ci:govc_username" + TEST_RUNNER_GOVC_PASSWORD: "tinkerbell_ci:govc_password" + TEST_RUNNER_GOVC_URL: "tinkerbell_ci:govc_url" + TEST_RUNNER_GOVC_DATACENTER: "tinkerbell_ci:govc_datacenter" + TEST_RUNNER_GOVC_DATASTORE: "tinkerbell_ci:govc_datastore" + TEST_RUNNER_GOVC_RESOURCE_POOL: "tinkerbell_ci:govc_resource_pool" + TEST_RUNNER_GOVC_NETWORK: "tinkerbell_ci:govc_network" + TEST_RUNNER_GOVC_FOLDER: "tinkerbell_ci:govc_folder" phases: pre_build: commands: @@ -130,7 +164,7 @@ phases: BUNDLES_OVERRIDE=true fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) - - QUICK_TESTS="($(yq e '.quick_tests | join("|")' ./test/e2e/QUICK_TESTS.yaml))" + - QUICK_TESTS="($(yq e '.quick_tests | map("^" + . + "$") | join("|")' ./test/e2e/QUICK_TESTS.yaml))" - > ./bin/test e2e run -c ${INTEGRATION_TEST_INFRA_CONFIG} diff --git a/test/e2e/QUICK_TESTS.yaml b/test/e2e/QUICK_TESTS.yaml index 50e77e403bc66..67937c0ca7296 100644 --- a/test/e2e/QUICK_TESTS.yaml +++ b/test/e2e/QUICK_TESTS.yaml @@ -1,6 +1,6 @@ quick_tests: # Docker -- TestDocker.*128 +- TestDocker.*128.* # vSphere - TestVSphereKubernetes128Ubuntu2204SimpleFlow # CloudStack @@ -8,4 +8,6 @@ quick_tests: # Nutanix - TestNutanixKubernetes127to128RedHat9Upgrade # Snow -# - TestSnowKubernetes128SimpleFlow \ No newline at end of file +- TestSnowKubernetes128SimpleFlow +# Tinkerbell +# - TestTinkerbellKubernetes127UbuntuTo128Upgrade