diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-19 10:17:56 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 13:44:28 +0000 |
| commit | eaf7508d09cea4c89a666d5ea1f38cdd73f09749 (patch) | |
| tree | ba8eb8de6fc2e4d1fed2fddc3153deee66c41c31 | |
| parent | f1e7a27e8425ae2485d812e4eba6b3ac26a8a9de (diff) | |
| download | infrastructure-eaf7508d09cea4c89a666d5ea1f38cdd73f09749.tar.gz | |
fixup! mason: Make some configuration parameters optional in mason.conf
| -rw-r--r-- | mason/share/turbo-hipster-config.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mason/share/turbo-hipster-config.yaml b/mason/share/turbo-hipster-config.yaml index 6df21bc2..4606e73d 100644 --- a/mason/share/turbo-hipster-config.yaml +++ b/mason/share/turbo-hipster-config.yaml @@ -19,6 +19,8 @@ plugins: artifact-cache-server: "{{ ARTIFACT_CACHE_SERVER }}" controllers: [ "{{ MASON_DISTBUILD_CONTROLLERS }}" ] cluster-morphology: "{{ MASON_CLUSTER_MORPHOLOGY }}" + +{% if MASON_TEST_INFRASTRUCTURE_TYPE != "none" %} - name: build-test function: build:build_test import-path: mason.tests.build_test @@ -30,6 +32,7 @@ plugins: deployment-host: [ "{{ MASON_TEST_HOSTS }}" ] trove-id: "{{ TROVE_ID }}" openstack-network-id: "{{ OPENSTACK_NETWORK_ID }}" +{% endif %} {%if MASON_UPSTREAM_TROVE is defined %} - name: artifact-upload |