opendev/system-config
Code Issues Proposed changes

Revert "rename maven-properties.sh script to version-properties.sh"

Browse Source 
This reverts commit dea3bdb050a55d56a1913e50e59cf176d70d3eb7.

This revert is necessary because it changed jenkins jobs before the
slave images could be rebuilt. We need to update the slave images first
then update the jenkins jobs in a pair of changes that can be merged one
at a time.

Change-Id: Iae4abf8c2dd8ad67ad008c57bbd17ba1304134c6
This commit is contained in:
Clark Boylan 2014-02-27 15:08:48 -08:00
parent 880924a621
commit db20f1f27a
7 changed files with 29 additions and 27 deletions
modules
jenkins/files/slave_scripts
maven-properties.sh
openstack_project/files/jenkins_job_builder/config
gerrit.yamlgroups.yamljavascript.yamljenkins-plugin-jobs.yamlmaven-plugin-jobs.yamlopenstackid.yaml

12
modules/jenkins/files/slave_scripts/version-properties.sh → modules/jenkins/files/slave_scripts/maven-properties.sh

@ -1,7 +1,9 @@
#!/bin/bash -ex
# This is a script that helps us version build artifacts. It retrieves
# git info and generates version strings.
# 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
@ -23,6 +25,6 @@ else
PROJECT_VER="$SCM_TAG.$COMMITS_SINCE_TAG.$SCM_SHA";
fi
echo "SCM_SHA=$SCM_SHA" >version.properties
echo "PROJECT_VER=$PROJECT_VER" >>version.properties
echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>version.properties
echo "SCM_SHA=$SCM_SHA" >maven.properties
echo "PROJECT_VER=$PROJECT_VER" >>maven.properties
echo "COMMITS_SINCE_TAG=$COMMITS_SINCE_TAG" >>maven.properties

12
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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: gerrit/version.properties
properties-file: gerrit/maven.properties
- install-buck
- shell: |
#!/bin/bash -xe
@ -148,9 +148,9 @@
- shell: |
#!/bin/bash -xe
cd gerrit
/usr/local/jenkins/slave_scripts/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: gerrit/version.properties
properties-file: gerrit/maven.properties
- install-buck
- shell: |
#!/bin/bash -xe
@ -182,9 +182,9 @@
- shell: |
#!/bin/bash -xe
cd gerrit
/usr/local/jenkins/slave_scripts/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: gerrit/version.properties
properties-file: gerrit/maven.properties
- install-buck
- shell: |
#!/bin/bash -xe

4
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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.properties
- shell: |
#!/bin/bash -xe
# fetch drush

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

8
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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.properties
- maven-target:
maven-version: Maven3
pom: pom.xml

8
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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.properties
- maven-target:
maven-version: Maven3
pom: pom.xml

4
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/version-properties.sh
/usr/local/jenkins/slave_scripts/maven-properties.sh
- inject:
properties-file: version.properties
properties-file: maven.properties
- shell: |
#!/bin/bash -xe
/usr/local/jenkins/slave_scripts/php-laravel-build.sh