Skip to content

Fix CI test project creation issue #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2020
Merged

Fix CI test project creation issue #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@

module "gke-project-1" {
source = "terraform-google-modules/project-factory/google"
version = "~> 3.0"
version = "~> 8.0"

name = "ci-gke"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
name = "ci-gke"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
skip_gcloud_download = true

auto_create_network = true

activate_apis = [
"bigquery-json.googleapis.com",
"bigquery.googleapis.com",
"cloudkms.googleapis.com",
"cloudresourcemanager.googleapis.com",
"compute.googleapis.com",
Expand All @@ -44,16 +45,17 @@ module "gke-project-1" {

module "gke-project-2" {
source = "terraform-google-modules/project-factory/google"
version = "~> 3.0"
version = "~> 8.0"

name = "ci-gke"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
name = "ci-gke"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
skip_gcloud_download = true

activate_apis = [
"bigquery-json.googleapis.com",
"bigquery.googleapis.com",
"cloudkms.googleapis.com",
"cloudresourcemanager.googleapis.com",
"compute.googleapis.com",
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ terraform {
}

provider "google" {
version = "2.20.1"
version = "3.25.0"
}

provider "google-beta" {
version = "3.21.0"
version = "3.25.0"
}