Skip to content
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.

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

Resolve Debian 8 EOL issue, now pin all tf module versions explicitly. #43

Merged
merged 1 commit into from
Aug 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions test/integration/build/gcp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ variable gcp_lb_ilb_name {

module "gce_lb_fr" {
project = "${var.gcp_project_id}"
source = "github.com/GoogleCloudPlatform/terraform-google-lb"
source = "github.com/GoogleCloudPlatform/terraform-google-lb?ref=1.0.2"
region = "${var.gcp_lb_region}"
network = "${var.gcp_lb_network}"
name = "${var.gcp_lb_fr_name}"
Expand All @@ -258,7 +258,7 @@ module "gce_lb_fr" {

module "gce_ilb" {
project = "${var.gcp_project_id}"
source = "github.com/GoogleCloudPlatform/terraform-google-lb-internal"
source = "github.com/GoogleCloudPlatform/terraform-google-lb-internal?ref=1.0.4"
region = "${var.gcp_lb_region}"
name = "${var.gcp_lb_ilb_name}"
ports = ["${module.mig2.service_port}"]
Expand Down Expand Up @@ -317,7 +317,7 @@ data "template_file" "group3-startup-script" {

module "mig1" {
project = "${var.gcp_project_id}"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group?ref=1.1.13"
region = "${var.gcp_lb_region}"
zone = "${var.gcp_lb_zone}"
name = "${var.gcp_lb_mig1_name}"
Expand All @@ -331,7 +331,7 @@ module "mig1" {

module "mig2" {
project = "${var.gcp_project_id}"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group?ref=1.1.13"
region = "${var.gcp_lb_region}"
zone = "${var.gcp_lb_zone_mig2}"
name = "${var.gcp_lb_mig2_name}"
Expand All @@ -344,7 +344,7 @@ module "mig2" {

module "mig3" {
project = "${var.gcp_project_id}"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group"
source = "github.com/GoogleCloudPlatform/terraform-google-managed-instance-group?ref=1.1.13"
region = "${var.gcp_lb_region}"
zone = "${var.gcp_lb_zone_mig3}"
name = "${var.gcp_lb_mig3_name}"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/verify/controls/google_compute_vms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
describe google_compute_instances(project: gcp_project_id, zone: gcp_zone) do
it { should exist }
its('count') { should be <= 100}
its('instance_ids.count') { should cmp 9 }
its('instance_ids.count') { should be > 0 }
its('instance_names') { should include gcp_ext_vm_data_disk_name }
# Only make the call if the configuration flag is specified and the test will run
gcp_instance_id = `gcloud compute instances list --filter="name=gcp-inspec-ext-linux-vm" --format=json | grep id | grep -o '[0-9]\\+'`.chomp.to_i
Expand Down