Skip to content

Commit 0d53d9f

Browse files
authored
chore: update mysql-public int test
2 parents 0e6c767 + 56d44d3 commit 0d53d9f

File tree

6 files changed

+9
-160
lines changed

6 files changed

+9
-160
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

build/int.cloudbuild.yaml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,28 +81,11 @@ steps:
8181
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy mssql-public-local']
8282
timeout: 1800s
8383

84-
- id: go-init-mysql-public
84+
- id: mysql-public
8585
waitFor:
8686
- prepare
8787
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
88-
args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=init go test -v -run TestMySqlPublicModule ./... -p 1']
89-
- id: go-apply-mysql-public
90-
waitFor:
91-
- go-init-mysql-public
92-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
93-
args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=apply go test -v -run TestMySqlPublicModule ./... -p 1']
94-
timeout: 3600s
95-
- id: go-verify-mysql-public
96-
waitFor:
97-
- go-apply-mysql-public
98-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
99-
args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=verify go test -v -run TestMySqlPublicModule ./... -p 1']
100-
- id: go-destroy-mysql-public
101-
waitFor:
102-
- go-verify-mysql-public
103-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
104-
args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=teardown go test -v -run TestMySqlPublicModule ./... -p 1']
105-
timeout: 1800s
88+
args: ['/bin/bash', '-c', 'cft test run TestMySqlPublicModule --verbose']
10689

10790
- id: converge-mysql-ha-local
10891
waitFor:
@@ -181,4 +164,4 @@ tags:
181164
- 'integration'
182165
substitutions:
183166
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
184-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
167+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'

kitchen.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
provisioner:
1717
name: terraform
1818

19+
driver:
20+
name: "terraform"
21+
verify_version: false
22+
1923
platforms:
2024
- name: local
2125

test/integration/mysql-public/controls/mysql.rb

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

test/integration/mysql-public/inspec.yml

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

0 commit comments

Comments
 (0)