From 1364275926df312204e006751dacc7af8e7d6726 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 22 Feb 2024 16:31:20 +0530 Subject: [PATCH] chore: use proper `talos_version_contract` for TF tests Use proper `talos_version_contract` for TF tests. Depends on: https://github.com/siderolabs/contrib/pull/36 Signed-off-by: Noel Georgi --- hack/test/e2e-aws-prepare.sh | 3 ++- hack/test/e2e.sh | 3 ++- hack/test/tfvars/aws.jq | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/test/e2e-aws-prepare.sh b/hack/test/e2e-aws-prepare.sh index baa34fbc5e..a9c9532429 100755 --- a/hack/test/e2e-aws-prepare.sh +++ b/hack/test/e2e-aws-prepare.sh @@ -66,8 +66,9 @@ jq --null-input \ --arg AMI_ID "${AMI_ID}" \ --arg NVIDIA_AMI_ID "${NVIDIA_AMI_ID}" \ --arg CLUSTER_NAME "${NAME_PREFIX}" \ + --arg TALOS_VERSION_CONTRACT "${TALOS_VERSION}" \ --arg KUBERNETES_VERSION "${KUBERNETES_VERSION}" \ - '{worker_group: $WORKER_GROUP, ami_id: $AMI_ID, nvidia_ami_id: $NVIDIA_AMI_ID, cluster_name: $CLUSTER_NAME, kubernetes_version: $KUBERNETES_VERSION}' \ + '{worker_group: $WORKER_GROUP, ami_id: $AMI_ID, nvidia_ami_id: $NVIDIA_AMI_ID, cluster_name: $CLUSTER_NAME, talos_version_contract: $TALOS_VERSION_CONTRACT, kubernetes_version: $KUBERNETES_VERSION}' \ | jq -f hack/test/tfvars/aws.jq > "${ARTIFACTS}/e2e-aws-generated/vars.json" cp hack/test/tfvars/*.yaml "${ARTIFACTS}/e2e-aws-generated" diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index 4cb3c3c1a6..e0c61fcedb 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -35,7 +35,8 @@ mkdir -p "${TMP}" # Talos export TALOSCONFIG="${TMP}/talosconfig" -export TALOS_VERSION=v1.1 +TALOS_VERSION=$(cut -d "." -f 1,2 <<< "${TAG}") +export TALOS_VERSION # Kubernetes diff --git a/hack/test/tfvars/aws.jq b/hack/test/tfvars/aws.jq index 5f9df9f6c3..55c3eac975 100644 --- a/hack/test/tfvars/aws.jq +++ b/hack/test/tfvars/aws.jq @@ -1,6 +1,7 @@ { "cluster_name": .cluster_name, "ccm": true, + "talos_version_contract": .talos_version_contract, "kubernetes_version": .kubernetes_version, "control_plane": { "ami_id": .ami_id,