Run E2E tests against forseti-security master branch (#3405)

forseti-security · Nov 5, 2019 · e2346c0 · e2346c0
1 parent c3e503b
commit e2346c0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/integration_tests/fixtures/bastion/main.tf b/integration_tests/fixtures/bastion/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration_tests/fixtures/bastion/outputs.tf b/integration_tests/fixtures/bastion/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration_tests/fixtures/bastion/variables.tf b/integration_tests/fixtures/bastion/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration_tests/fixtures/forseti/main.tf b/integration_tests/fixtures/forseti/main.tf
@@ -1,5 +1,5 @@
 /**
-* Copyright 2018 Google LLC
+* Copyright 2019 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ module "forseti" {
   project_id         = var.project_id
   org_id             = var.org_id
   domain             = var.domain
+  forseti_version    = var.forseti_version
 
   client_instance_metadata = {
     sshKeys = "ubuntu:${tls_private_key.main.public_key_openssh}"

diff --git a/integration_tests/fixtures/forseti/outputs.tf b/integration_tests/fixtures/forseti/outputs.tf
@@ -1,5 +1,5 @@
 /**
-* Copyright 2018 Google LLC
+* Copyright 2019 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ output "bastion_host" {
   value = module.bastion.host
 }
 
-output "forseti-cai-storage-bucket" {
-  description = "Forseti CAI storage bucket"
-  value       = module.forseti.forseti-cai-storage-bucket
-}
+//output "forseti-cai-storage-bucket" {
+//  description = "Forseti CAI storage bucket"
+//  value       = module.forseti.forseti-cai-storage-bucket
+//}
 
 output "forseti-client-vm-ip" {
   description = "Forseti Client VM private IP address"

diff --git a/integration_tests/fixtures/forseti/scripts/wait-for-forseti.sh b/integration_tests/fixtures/forseti/scripts/wait-for-forseti.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/integration_tests/fixtures/forseti/variables.tf b/integration_tests/fixtures/forseti/variables.tf
@@ -1,5 +1,5 @@
 /**
-*   Copyright 2018 Google LLC
+*   Copyright 2019 Google LLC
 *  
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -33,3 +33,9 @@ variable "org_id" {
 variable "project_id" {
   description = "The ID of an existing Google project where Forseti will be installed"
 }
+
+variable "forseti_version" {
+  description = "The version of Forseti to deploy"
+  default = "master"
+}
+
diff --git a/integration_tests/tests/forseti/inspec.yml b/integration_tests/tests/forseti/inspec.yml
@@ -51,9 +51,9 @@ attributes:
 - name: forseti-server-service-account
   required: true
   type: string
-- name: forseti-cai-storage-bucket
-  required: true
-  type: string
+#- name: forseti-cai-storage-bucket
+#  required: true
+#  type: string
 - name: kms_resources_names
   required: true
   type: array