From d7cec1d1ac1e18c9c243df79ad69e803349baf4e Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Tue, 24 Jun 2014 11:59:41 +1000 Subject: [PATCH] Remove envinject from javascript Instead source the properties into the environment. The macros js-build and assert-no-extra-files did not require any of the properties and as such do not require updating. Change-Id: I3297b2d9d503425e5d586d83eaab4f6c8e65039a --- .../files/jenkins_job_builder/config/javascript.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml index 3e278c4a0c..381d068a9c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml @@ -10,11 +10,6 @@ builders: - revoke-sudo - gerrit-git-prep - - shell: | - #!/bin/bash -xe - /usr/local/jenkins/slave_scripts/version-properties.sh - - inject: - properties-file: version.properties - js-build: command: 'test' envlist: 'grunt' @@ -47,11 +42,6 @@ builders: - revoke-sudo - gerrit-git-prep - - shell: | - #!/bin/bash -xe - /usr/local/jenkins/slave_scripts/version-properties.sh - - inject: - properties-file: version.properties - js-build: command: 'build' envlist: 'grunt' @@ -59,6 +49,8 @@ project: '{name}' - shell: | #!/bin/bash -xe + /usr/local/jenkins/slave_scripts/version-properties.sh + source version.properties # Clean/create a tarball directory rm -rf tarballs