Skip to content

Commit 486d6bd

Browse files
Update test to run all
* Fixed #274
1 parent 81eb717 commit 486d6bd

20 files changed

+35
-292
lines changed

.dockerignore

Lines changed: 0 additions & 11 deletions
This file was deleted.

.kitchen.yml

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ platforms:
2929
- name: local
3030

3131
suites:
32-
# Disabled due to issue #274
33-
# (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/274)
34-
# - name: "deploy_service"
35-
# driver:
36-
# root_module_directory: test/fixtures/deploy_service
37-
# verifier:
38-
# systems:
39-
# - name: deploy_service
40-
# backend: local
32+
- name: "deploy_service"
33+
driver:
34+
root_module_directory: test/fixtures/deploy_service
35+
verifier:
36+
systems:
37+
- name: deploy_service
38+
backend: local
4139
- name: "disable_client_cert"
4240
driver:
4341
root_module_directory: test/fixtures/disable_client_cert
@@ -47,13 +45,13 @@ suites:
4745
backend: local
4846
# Disabled due to issue #274
4947
# (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/274)
50-
# - name: "node_pool"
51-
# driver:
52-
# root_module_directory: test/fixtures/node_pool
53-
# verifier:
54-
# systems:
55-
# - name: node_pool
56-
# backend: local
48+
- name: "node_pool"
49+
driver:
50+
root_module_directory: test/fixtures/node_pool
51+
verifier:
52+
systems:
53+
- name: node_pool
54+
backend: local
5755
- name: "shared_vpc"
5856
driver:
5957
root_module_directory: test/fixtures/shared_vpc
@@ -68,40 +66,36 @@ suites:
6866
systems:
6967
- name: simple_regional
7068
backend: local
71-
- name: "simple_regional_private"
69+
- name: "simple_regional_private" #
7270
driver:
7371
root_module_directory: test/fixtures/simple_regional_private
7472
verifier:
7573
systems:
7674
- name: simple_regional_private
7775
backend: local
78-
- name: "simple_zonal"
76+
- name: "simple_zonal" #
7977
driver:
8078
root_module_directory: test/fixtures/simple_zonal
8179
verifier:
8280
systems:
83-
- name: gcloud
81+
- name: simple_zonal
8482
backend: local
85-
controls:
86-
- gcloud
87-
- name: gcp
88-
backend: gcp
89-
controls:
90-
- gcp
91-
- name: "simple_zonal_private"
83+
- name: "simple_zonal_private" #
9284
driver:
9385
root_module_directory: test/fixtures/simple_zonal_private
9486
verifier:
9587
systems:
9688
- name: simple_zonal_private
9789
backend: local
98-
- name: "stub_domains"
90+
- name: "stub_domains" #
9991
driver:
10092
root_module_directory: test/fixtures/stub_domains
10193
verifier:
10294
systems:
10395
- name: stub_domains
10496
backend: local
97+
98+
10599
# Disabled due to issue #264
106100
# (https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/264)
107101
# - name: stub_domains_private
@@ -110,14 +104,14 @@ suites:
110104
# systems:
111105
# - name: stub_domains_private
112106
# backend: local
113-
- name: "upstream_nameservers"
107+
- name: "upstream_nameservers" #
114108
driver:
115109
root_module_directory: test/fixtures/upstream_nameservers
116110
verifier:
117111
systems:
118112
- name: upstream_nameservers
119113
backend: local
120-
- name: "stub_domains_upstream_nameservers"
114+
- name: "stub_domains_upstream_nameservers" #
121115
driver:
122116
root_module_directory: test/fixtures/stub_domains_upstream_nameservers
123117
verifier:

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ tags:
3838
- 'integration'
3939
substitutions:
4040
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
41-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.1.0'
41+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.2'

helpers/migrate.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,5 @@ def argparser():
307307

308308

309309
if __name__ == "__main__":
310-
main(sys.argv)
310+
main(sys.argv)
311+

test/ci/deploy-service.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/node-pool.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/shared-vpc.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/simple-regional-private.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/simple-regional.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/simple-zonal-private.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/simple-zonal.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/stub-domains-upstream-nameservers.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/stub-domains.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/upstream-nameservers.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/ci/workload-metadata-config.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/integration/disable_client_cert/inspec.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ attributes:
33
- name: project_id
44
required: true
55
type: string
6-
- name: credentials_path
7-
required: true
8-
type: string
96
- name: location
107
required: true
118
type: string

test/integration/simple_zonal/controls/gcp.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)