From 91a788c49f07301662f83e91f6659611df82de14 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Thu, 3 Oct 2019 13:54:29 -0700 Subject: [PATCH] integration test pipeline fixes (#2421) Merged PR #2421. --- .ci/acceptance-tests/ansible-integration.sh | 15 ++++++++++----- build/inspec | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.ci/acceptance-tests/ansible-integration.sh b/.ci/acceptance-tests/ansible-integration.sh index 7d2c2271135f..3353b44a9d23 100755 --- a/.ci/acceptance-tests/ansible-integration.sh +++ b/.ci/acceptance-tests/ansible-integration.sh @@ -15,15 +15,20 @@ 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 @@ -31,4 +36,4 @@ 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 ") diff --git a/build/inspec b/build/inspec index 3a319d15f3f9..581376b77107 160000 --- a/build/inspec +++ b/build/inspec @@ -1 +1 @@ -Subproject commit 3a319d15f3f9c3e788eeeec85c8fd685abd0e56a +Subproject commit 581376b7710732aa92f94e8de7002362f7a2160a