Merge "Fix intermittent jenkins plugin build failure"

modules/jenkins/files/slave_scripts/maven-properties.sh

@@ -5,9 +5,6 @@
 # pass to maven build commands so that we can generate
 # versioned builds within the gerrit workflow.
 
-# work around for jenkins bug: https://issues.jenkins-ci.org/browse/JENKINS-14193
-/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org http://zuul.openstack.org
-
 # get version info from scm
 SCM_TAG=`git describe --abbrev=0 --tags` || true
 SCM_SHA=`git rev-parse --short HEAD` || true

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

@@ -1,9 +1,8 @@
-# need to run gerrit-git-prep in maven-properties.sh script to work
-# around jenkins bug: https://issues.jenkins-ci.org/browse/JENKINS-14193
+# usig a freestyle project to work around jenkins bug: 
+# https://issues.jenkins-ci.org/browse/JENKINS-14193
 
 - job-template:
     name: 'gate-{name}-build'
-    project-type: maven
     node: precise
 
     wrappers:
@@ -11,25 +10,26 @@
           timeout: 30
           fail: true
       - timestamps
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
+
+    builders:
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
           properties-file: maven.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: '{maven-group-id}'
-        artifact-id: '{name}'
-      root-pom: pom.xml
-      goals: 'clean package -Dproject-version=${{PROJECT_VER}}'
+      - maven-target:
+          maven-version: Maven3
+          pom: pom.xml
+          goals: 'clean package'
+          properties:
+            - project-version=${{PROJECT_VER}}
 
     publishers:
       - console-log
 
 - job-template:
     name: '{name}-hpi-artifact'
-    project-type: maven
     node: precise
 
     wrappers:
@@ -37,18 +37,20 @@
           timeout: 30
           fail: true
       - timestamps
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
+
+    builders:
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
       - inject:
           properties-file: maven.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: '{maven-group-id}'
-        artifact-id: '{name}'
-      root-pom: pom.xml
-      goals: 'clean package -Dmaven.test.skip=true -Dproject-version=${{PROJECT_VER}}'
+      - maven-target:
+          maven-version: Maven3
+          pom: pom.xml
+          goals: 'clean package'
+          properties:
+            - project-version=${{PROJECT_VER}}
 
     postbuilders:
       - shell: |