Merge "remove envinject usage from jenkins-plugin-jobs.yaml"

modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml

@@ -16,14 +16,8 @@
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/version-properties.sh
-      - inject:
+          source version.properties
-          properties-file: version.properties
+          mvn clean package -B -Dproject-version=$PROJECT_VER
-      - maven-target:
-          maven-version: Maven3
-          pom: pom.xml
-          goals: 'clean package -B'
-          properties:
-            - project-version=${{PROJECT_VER}}
 
     publishers:
       - console-log
@@ -43,21 +37,14 @@
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/version-properties.sh
-      - inject:
+          source version.properties
-          properties-file: version.properties
+          mvn clean package -B -Dproject-version=$PROJECT_VER
-      - maven-target:
+          cp ./target/{name}.hpi ./target/{name}-$PROJECT_VER.hpi
-          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
 
     publishers:
       - war:
           site: '{tarball-site}'
-          warfile: 'target/{name}-${{PROJECT_VER}}.hpi'
+          warfile: 'target/{name}-*.hpi'
           target: 'tarballs/ci/{name}'
       - console-log