From eaf7508d09cea4c89a666d5ea1f38cdd73f09749 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 19 May 2015 10:17:56 +0100
Subject: fixup! mason: Make some configuration parameters optional in
 mason.conf

---
 mason/share/turbo-hipster-config.yaml | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.1