Skip to content

Commit

Permalink
integration test pipeline fixes (#2421)
Browse files Browse the repository at this point in the history 
Merged PR #2421.
  • Loading branch information
@rambleraptor @modular-magician
rambleraptor authored and modular-magician committed Oct 3, 2019
1 parent ec5e46c commit 91a788c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
15 changes: 10 additions & 5 deletions .ci/acceptance-tests/ansible-integration.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,25 @@ pip install -r requirements.txt
source hacking/env-setup
popd

# Clone ansible_collections_google because submodules
# break collections
git clone https://github.com/ansible/ansible_collections_google.git

# Build newest modules
pushd magic-modules-gcp
bundle install
bundle exec compiler -a -e ansible -o build/ansible
bundle exec compiler -a -e ansible -o ../ansible_collections_google
popd

# Install collection
pushd magic-modules-gcp/build/ansible
ansible-galaxy build .
ansible-galaxy install ~/.ansible/collections
pushd ansible_collections_google
ansible-galaxy collection build .
ansible-galaxy collection install *.gz
popd

# Setup Cloud configuration template with variables
pushd ~/.ansible/collections/ansible_collections/google/cloud
cp /tmp/ansible-template.ini tests/integration/cloud-config-gcp.ini

# Run ansible
ansible-test integration -v --allow-unsupported --continue-on-error $(find test/integration/targets -name "gcp*" -type d -printf "%P ")
ansible-test integration -v --allow-unsupported --continue-on-error $(find tests/integration/targets -name "gcp*" -type d -printf "%P ")
2 changes: 1 addition & 1 deletion build/inspec
Submodule inspec updated 16 files
+32 −0 docs/resources/google_runtime_config_config.md
+46 −0 docs/resources/google_runtime_config_config_iam_policy.md
+29 −0 docs/resources/google_runtime_config_configs.md
+36 −0 docs/resources/google_runtime_config_variable.md
+31 −0 docs/resources/google_runtime_config_variables.md
+62 −0 libraries/google_runtime_config_config.rb
+59 −0 libraries/google_runtime_config_config_iam_policy.rb
+86 −0 libraries/google_runtime_config_configs.rb
+66 −0 libraries/google_runtime_config_variable.rb
+90 −0 libraries/google_runtime_config_variables.rb
+21 −0 test/integration/build/gcp-mm.tf
+8 −0 test/integration/configuration/mm-attributes.yml
+32 −0 test/integration/verify/controls/google_runtime_config_config.rb
+27 −0 test/integration/verify/controls/google_runtime_config_configs.rb
+33 −0 test/integration/verify/controls/google_runtime_config_variable.rb
+28 −0 test/integration/verify/controls/google_runtime_config_variables.rb

0 comments on commit 91a788c

Please sign in to comment.