chore(e2e): Remove go version variable (#6524)
This commit is contained in:
1 parent
cb8edfc926
commit
0ad2bb65dc
13 files changed
+17
-55
No files matched your search
@@ -106,9 +106,7 @@ scenario "e2e_docker_base_connect" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_connect"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -119,10 +119,8 @@ scenario "e2e_docker_base_plus" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_plus"
|
||||
docker_mirror = var.docker_mirror
|
||||
controller_container_name = step.create_boundary.container_name
|
||||
network_name = step.create_docker_network.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -113,9 +113,7 @@ scenario "e2e_docker_base_with_gcp" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/gcp"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -129,9 +129,7 @@ scenario "e2e_docker_base_with_vault" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_vault"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -165,9 +165,7 @@ scenario "e2e_docker_base_with_worker_version" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_worker"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network_cluster.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -160,9 +160,7 @@ scenario "e2e_docker_base_with_worker" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_worker"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network_cluster.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -106,9 +106,7 @@ scenario "e2e_docker_base" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -175,9 +175,7 @@ scenario "e2e_docker_worker_registration_controller_led" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_worker"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network_cluster.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -190,9 +190,7 @@ scenario "e2e_docker_worker_registration_worker_led" {
|
||||
]
|
||||
variables {
|
||||
test_package = "github.com/hashicorp/boundary/testing/internal/e2e/tests/base_with_worker"
|
||||
docker_mirror = var.docker_mirror
|
||||
network_name = step.create_docker_network_cluster.network_name
|
||||
go_version = var.go_version
|
||||
debug_no_run = var.e2e_debug_no_run
|
||||
alb_boundary_api_addr = step.create_boundary.address
|
||||
auth_method_id = step.create_boundary.auth_method_id
|
||||
|
||||
@@ -199,12 +199,6 @@ variable "aws_region" {
|
||||
default = "us-east-1"
|
||||
}
|
||||
|
||||
variable "go_version" {
|
||||
description = "Version of Golang used by the application under test"
|
||||
type = string
|
||||
default = ""
|
||||
}
|
||||
|
||||
variable "hcp_boundary_cluster_id" {
|
||||
description = "ID of the Boundary cluster in HCP"
|
||||
type = string
|
||||
@@ -288,4 +282,4 @@ variable "worker_version" {
|
||||
description = "Manually set worker version to test different worker/controller version combinations"
|
||||
type = string
|
||||
default = null
|
||||
}
|
||||
}
|
||||
@@ -14,10 +14,6 @@ terraform {
|
||||
}
|
||||
}
|
||||
|
||||
variable "docker_mirror" {
|
||||
description = "URL to the docker repository"
|
||||
type = string
|
||||
}
|
||||
variable "network_name" {
|
||||
description = "Name of Docker Network"
|
||||
type = string
|
||||
@@ -27,11 +23,6 @@ variable "controller_container_name" {
|
||||
type = string
|
||||
default = ""
|
||||
}
|
||||
variable "go_version" {
|
||||
description = "Version of Golang used by the application under test"
|
||||
type = string
|
||||
default = ""
|
||||
}
|
||||
variable "debug_no_run" {
|
||||
description = "If set, this module will not execute the tests so that you can still access environment variables"
|
||||
type = bool
|
||||
@@ -301,29 +292,15 @@ variable "gcp_host_set_ips" {
|
||||
default = [""]
|
||||
}
|
||||
|
||||
resource "enos_local_exec" "get_go_version" {
|
||||
count = var.go_version == "" ? 1 : 0
|
||||
inline = ["cat $(echo $(git rev-parse --show-toplevel))/.go-version | xargs"]
|
||||
}
|
||||
|
||||
locals {
|
||||
go_version = var.go_version == "" ? enos_local_exec.get_go_version[0].stdout : var.go_version
|
||||
image_name = trimspace("${var.docker_mirror}/library/golang:${local.go_version}")
|
||||
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
|
||||
package_name = reverse(split("/", var.test_package))[0]
|
||||
}
|
||||
|
||||
resource "docker_image" "go" {
|
||||
name = local.image_name
|
||||
keep_locally = true
|
||||
}
|
||||
|
||||
resource "enos_local_exec" "run_e2e_test" {
|
||||
depends_on = [docker_image.go]
|
||||
environment = {
|
||||
TEST_PACKAGE = var.test_package
|
||||
TEST_TIMEOUT = var.test_timeout
|
||||
TEST_RUNNER_IMAGE = docker_image.go.image_id
|
||||
TEST_NETWORK_NAME = var.network_name
|
||||
E2E_TESTS = "true"
|
||||
BOUNDARY_ADDR = var.alb_boundary_api_addr
|
||||
|
||||
Reference in new issue
Block a user