diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
| commit | 19d3ce76b9f785ee34457482415dee9bc4aaf9d2 (patch) | |
| tree | e2525d92184b752d7bdd9e87a862b11a848b850f /mason/mason.sh | |
| parent | 6b9c0c1ba8b23741349c535adf426a9e8a41d3c1 (diff) | |
| parent | b3a7c84e3dfb3385b7c5f5cc104ab2f6be278b91 (diff) | |
| download | definitions-19d3ce76b9f785ee34457482415dee9bc4aaf9d2.tar.gz | |
Merge branch 'baserock/adamcoldrick/mason-openstack-rebased'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'mason/mason.sh')
| -rwxr-xr-x | mason/mason.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/mason/mason.sh b/mason/mason.sh index 32aab032..5d27b7cf 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load OpenStack credentials +. /etc/os.conf + set -e set -x @@ -59,11 +62,20 @@ else echo INFO: Created "$releases_made" release images fi -"scripts/release-test" \ - --deployment-host "$DISTBUILD_ARCH":"$TEST_VM_HOST_SSH_URL" \ - --trove-host "$UPSTREAM_TROVE_ADDRESS" \ - --trove-id "$TROVE_ID" \ - "$BUILD_CLUSTER_MORPHOLOGY" +if [ "$TEST_INFRASTRUCTURE_TYPE" = "openstack" ]; then + "scripts/release-test-os" \ + --deployment-host "$DISTBUILD_ARCH":"$MASON_TEST_HOST" \ + --trove-host "$UPSTREAM_TROVE_ADDRESS" \ + --trove-id "$TROVE_ID" \ + --net-id "$OPENSTACK_NETWORK_ID" \ + "$BUILD_CLUSTER_MORPHOLOGY" +elif [ "$TEST_INFRASTRUCTURE_TYPE" = "kvmhost" ]; then + "scripts/release-test" \ + --deployment-host "$DISTBUILD_ARCH":"$MASON_TEST_HOST" \ + --trove-host "$UPSTREAM_TROVE_ADDRESS" \ + --trove-id "$TROVE_ID" \ + "$BUILD_CLUSTER_MORPHOLOGY" +fi "scripts/release-upload" --build-trove-host "$ARTIFACT_CACHE_SERVER" \ --arch "$DISTBUILD_ARCH" \ |