From d053652923b431f2b8facf0e9402629759824a54 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 27 Feb 2014 15:16:50 -0800 Subject: [PATCH] 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 --- .../files/slave_scripts/maven-properties.sh | 30 ------------------- .../jenkins_job_builder/config/gerrit.yaml | 12 ++++---- .../jenkins_job_builder/config/groups.yaml | 4 +-- .../config/javascript.yaml | 8 ++--- .../config/jenkins-plugin-jobs.yaml | 8 ++--- .../config/maven-plugin-jobs.yaml | 8 ++--- .../config/openstackid.yaml | 4 +-- 7 files changed, 22 insertions(+), 52 deletions(-) delete mode 100755 modules/jenkins/files/slave_scripts/maven-properties.sh diff --git a/modules/jenkins/files/slave_scripts/maven-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh deleted file mode 100755 index 7386acb20c..0000000000 --- a/modules/jenkins/files/slave_scripts/maven-properties.sh +++ /dev/null @@ -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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml index 2688fb371d..a0aed45782 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml +++ b/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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml index fb8eae7e00..d8d99a1d4c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml +++ b/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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml index 271e260322..16abdf7788 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml +++ b/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' 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 5348f2548f..60151b255f 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 @@ -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 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 e9dd305cc6..4654ed294c 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 @@ -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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml index b99fa97924..9383d17564 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml +++ b/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