From 09223af05465b9b0e7466a027bc6ca9bb7626124 Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Thu, 26 Jun 2014 10:16:48 -0700
Subject: [PATCH] remove envinject usage from jenkins-plugin-jobs.yaml

Instead of using envinject jenkins plugin just source the
variables from within the shell builder.

Change-Id: I040495d0dda8545d60186af55f09da817f55ef51
---
 .../config/jenkins-plugin-jobs.yaml           | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index dbf6b7756e..014a6b0d8b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-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 -B'
-          properties:
-            - project-version=${{PROJECT_VER}}
+          source version.properties
+          mvn clean package -B -Dproject-version=$PROJECT_VER
 
     publishers:
       - console-log
@@ -45,21 +39,14 @@
       - 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 -B'
-          properties:
-            - project-version=${{PROJECT_VER}}
-      - shell: |
-            cp ./target/{name}.hpi ./target/{name}-$PROJECT_VER.hpi
+          source version.properties
+          mvn clean package -B -Dproject-version=$PROJECT_VER
+          cp ./target/{name}.hpi ./target/{name}-$PROJECT_VER.hpi
 
     publishers:
       - war:
           site: '{tarball-site}'
-          warfile: 'target/{name}-${{PROJECT_VER}}.hpi'
+          warfile: 'target/{name}-*.hpi'
           target: 'tarballs/ci/{name}'
       - console-log