From 8e164f1537a1e55edc4d950f2782a57f0c240e33 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 4 Dec 2013 18:37:01 -0500 Subject: [PATCH] Don't assume substitation for a non-template job The solum devstack job assumed {{ would be translated to {. This was because it was based on something similar. The key difference is that this is defined as a job, while this substitution only happens for a job-template. Change-Id: I8d25e51fa4c0e0f0c7cc056f82f1592f39dae15b --- .../files/jenkins_job_builder/config/solum.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index aa1afb8f7d..ecb94ff0e7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -15,13 +15,13 @@ export PYTHONUNBUFFERED=true export ENABLED_SERVICES=solum - function pre_test_hook {{ + function pre_test_hook { # Install solum devstack integration SOLUM_BASE=/opt/stack/new/solum/contrib/devstack DEVSTACK_BASE=/opt/stack/new/devstack cp $SOLUM_BASE/lib/* $DEVSTACK_BASE/lib cp $SOLUM_BASE/extras.d/* $DEVSTACK_BASE/extras.d - }} + } export -f pre_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh