[tests] fix to gke-regional test

danisla · danisla · commit b0f8d241673b · 2018-08-16T00:45:14.000Z
diff --git a/tests/infra/example-gke-nat-gateway-regional/main.tf b/tests/infra/example-gke-nat-gateway-regional/main.tf
@@ -18,6 +18,10 @@ variable region {
   default = "us-central1"
 }
 
+variable zone {
+  default = "us-central1-a"
+}
+
 variable network_name {
   default = "tf-ci-nat-gke-regional"
 }
@@ -29,7 +33,7 @@ provider google {
 }
 
 data "google_container_engine_versions" "default" {
-  zone = "${element(var.zones, 0)}"
+  zone = "${var.zone}"
 }
 
 resource "google_compute_network" "tf-ci" {
diff --git a/tests/pipelines/tf-nat-gw-pull-requests.yaml b/tests/pipelines/tf-nat-gw-pull-requests.yaml
@@ -103,6 +103,7 @@ jobs:
       infra_dir: git/tests/infra/example-gke-nat-gateway-regional
       region: us-east4
       zone: us-east4-c
+      TF_VAR_zone: us-east4-c
     on_failure:
       put: git-pull-requests
       params:
@@ -123,6 +124,7 @@ jobs:
       infra_dir: git/tests/infra/example-gke-nat-gateway-regional
       region: us-east4
       zone: us-east4-c
+      TF_VAR_zone: us-east4-c
     on_failure:
       put: git-pull-requests
       params:
diff --git a/tests/pipelines/tf-nat-gw-regression.yaml b/tests/pipelines/tf-nat-gw-regression.yaml
@@ -95,6 +95,7 @@ jobs:
       infra_dir: git/tests/infra/example-gke-nat-gateway-regional
       region: us-west1
       zone: us-west1-b
+      TF_VAR_zone: us-west1-b
     on_failure:
       put: send-an-email
       params:

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ variable region {`
`18`	`18`	`default = "us-central1"`
`19`	`19`	`}`
`20`	`20`
	`21`	`+variable zone {`
	`22`	`+ default = "us-central1-a"`
	`23`	`+}`
	`24`	`+`
`21`	`25`	`variable network_name {`
`22`	`26`	`default = "tf-ci-nat-gke-regional"`
`23`	`27`	`}`
`@@ -29,7 +33,7 @@ provider google {`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`data "google_container_engine_versions" "default" {`
`32`		`- zone = "${element(var.zones, 0)}"`
	`36`	`+ zone = "${var.zone}"`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`resource "google_compute_network" "tf-ci" {`