From d6e5c18a278407990daec316a6666fe4dcf8245b Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Fri, 27 Jun 2014 15:37:56 +1000 Subject: [PATCH] Remove envinject usage from maven-plugin-jobs.yaml Instead of using envinject jenkins plugin just source the variables from within the shell builder. Change-Id: Ie5cef75578132c05872c5b7b9d16841a4515f979 --- .../config/maven-plugin-jobs.yaml | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml index 94f9a62fb0..51813472d8 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml @@ -17,14 +17,8 @@ - shell: | #!/bin/bash -xe /usr/local/jenkins/slave_scripts/version-properties.sh - - inject: - properties-file: version.properties - - maven-target: - maven-version: Maven3 - pom: pom.xml - goals: 'clean package' - properties: - - project-version=${{PROJECT_VER}} + source version.properties + mvn clean package -Dproject-version=$PROJECT_VER publishers: - console-log @@ -45,19 +39,13 @@ - shell: | #!/bin/bash -xe /usr/local/jenkins/slave_scripts/version-properties.sh - - inject: - properties-file: version.properties - - maven-target: - maven-version: Maven3 - pom: pom.xml - goals: 'clean package' - properties: - - project-version=${{PROJECT_VER}} + source version.properties + mvn clean package -Dproject-version=$PROJECT_VER publishers: - war: site: '{tarball-site}' - warfile: 'target/{name}-${{PROJECT_VER}}.jar' + warfile: 'target/{name}-*.jar' target: 'tarballs/ci/{name}' - console-log