From 8d1ef344211944252de63984cc54dad491772c32 Mon Sep 17 00:00:00 2001 From: Rado Chmiel Date: Thu, 4 Jul 2024 19:50:54 +0200 Subject: [PATCH] Revert "Enable autodestroy in CI VMs (#263)" This reverts commit be04e4e840112c32baa6768a15968680bb22474c. --- e2e/terraform/modules/gcp/main.tf | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/e2e/terraform/modules/gcp/main.tf b/e2e/terraform/modules/gcp/main.tf index b8b13605..21e1c335 100644 --- a/e2e/terraform/modules/gcp/main.tf +++ b/e2e/terraform/modules/gcp/main.tf @@ -1,7 +1,7 @@ terraform { required_providers { random = "~> 3.5" - google = "~> 5.27" + google = "~> 4.80" } } @@ -12,13 +12,6 @@ provider "google" { zone = var.zone } -provider "google-beta" { - credentials = file(var.credentials) - project = var.project - region = var.region - zone = var.zone -} - resource "random_string" "vm-name" { length = 6 upper = false @@ -28,7 +21,7 @@ resource "random_string" "vm-name" { } locals { - vm-name = "e2e-vm-${random_string.vm-name.result}" + vm-name = "e2e-vm-${random_string.vm-name.result}" } resource "google_compute_instance" "lab_instances" { @@ -55,7 +48,6 @@ resource "google_compute_instance" "lab_instances" { } resource "google_compute_instance" "e2e_instances" { - provider = google-beta count = var.nephio_e2e_nodes name = local.vm-name machine_type = var.instance @@ -111,14 +103,4 @@ resource "google_compute_instance" "e2e_instances" { "sudo -E FAIL_FAST=${var.nephio_e2e_fail_fast} E2ETYPE=${var.nephio_e2e_type} NEPHIO_REPO_DIR=/home/${var.ansible_user}/test-infra NEPHIO_DEBUG=true NEPHIO_RUN_E2E=true NEPHIO_USER=${var.ansible_user} ./init.sh" ] } - scheduling { - max_run_duration { - seconds = 2 * 60 * 60 - } - instance_termination_action = "DELETE" - on_host_maintenance = "TERMINATE" - preemptible = true - automatic_restart = false - provisioning_model = "SPOT" - } }