Switch to using version-properties.sh script.

Use the new version-properties.sh script. Note this should only be done
once all slave images have the new version-properties.sh script in
place. Without it jobs will fail.

Change-Id: Ieaa16cc264fa57556afbd37b723503a19ce6682a

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

@@ -1,30 +0,0 @@
-#!/bin/bash -ex
-
-# This file is a helper for versioning and deployment of
-# maven projects.  It sets up environment variables to
-# pass to maven build commands so that we can generate
-# versioned builds within the gerrit workflow.
-
-# get version info from scm
-SCM_TAG=`git describe --abbrev=0 --tags` || true
-SCM_SHA=`git rev-parse --short HEAD` || true
-
-# assumes format is like this  '0.0.4-2-g135721c'
-COMMITS_SINCE_TAG=`git describe | awk '{split($0,a,"-"); print a[2]}'` || true
-
-# just use git sha if there is no tag yet.
-if [[ "${SCM_TAG}" == "" ]]; then
-    SCM_TAG=$SCM_SHA
-fi
-
-# General build version should be something like '0.0.4.3.d4ee90c'
-# Release build version should be something like '0.0.5'
-if [[ "${COMMITS_SINCE_TAG}" == "" ]]; then
-    PROJECT_VER=$SCM_TAG
-else
-    PROJECT_VER="$SCM_TAG.$COMMITS_SINCE_TAG.$SCM_SHA";
-fi
-
-echo "SCM_SHA=$SCM_SHA" >maven.properties
-echo "PROJECT_VER=$PROJECT_VER" >>maven.properties
-echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>maven.properties

modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml

@@ -110,9 +110,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -148,9 +148,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe
@@ -182,9 +182,9 @@
       - shell: |
           #!/bin/bash -xe
           cd gerrit
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: gerrit/maven.properties
+          properties-file: gerrit/version.properties
       - install-buck
       - shell: |
           #!/bin/bash -xe

modules/openstack_project/files/jenkins_job_builder/config/groups.yaml

@@ -30,9 +30,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/maven-properties.sh
+            /usr/local/jenkins/slave_scripts/version-properties.sh
         - inject:
-            properties-file: maven.properties
+            properties-file: version.properties
         - shell: |
             #!/bin/bash -xe
             # fetch drush

modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml

@@ -11,9 +11,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - js-build:
           command: 'test'
           envlist: 'grunt'
@@ -47,9 +47,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - js-build:
           command: 'build'
           envlist: 'grunt'

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

@@ -15,9 +15,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -42,9 +42,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml

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

@@ -15,9 +15,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml
@@ -42,9 +42,9 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/maven-properties.sh
+          /usr/local/jenkins/slave_scripts/version-properties.sh
       - inject:
-          properties-file: maven.properties
+          properties-file: version.properties
       - maven-target:
           maven-version: Maven3
           pom: pom.xml

modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml

@@ -26,9 +26,9 @@
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            /usr/local/jenkins/slave_scripts/maven-properties.sh
+            /usr/local/jenkins/slave_scripts/version-properties.sh
         - inject:
-            properties-file: maven.properties
+            properties-file: version.properties
         - shell: |
             #!/bin/bash -xe
             /usr/local/jenkins/slave_scripts/php-laravel-build.sh