diff options
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 13ea21db..cf1341e3 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Load OpenStack credentials +. /root/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_INFRA" = "openstack" ]; then + "/root/release-test-os" \ + --deployment-host "$DISTBUILD_ARCH":"$TEST_VM_HOST_SSH_URL" \ + --trove-host "$UPSTREAM_TROVE_ADDRESS" \ + --trove-id "$TROVE_ID" \ + --net-id "$OPENSTACK_NET_ID" \ + "$BUILD_CLUSTER_MORPHOLOGY" +elif [ "$TEST_INFRA" = "kvmhost" ]; then + "scripts/release-test" \ + --deployment-host "$DISTBUILD_ARCH":"$TEST_VM_HOST_SSH_URL" \ + --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" \ |