opendev/system-config
Code Issues Proposed changes

Remove envinject from gerrit

Browse Source 
Instead source the properties into the environment.

Change-Id: I9861bd3ebe2320e088e0613940df04282dade05f
This commit is contained in:
Joshua Hesketh 2014-06-24 11:57:44 +10:00
parent 356109c8d6
commit 96b4fad591
1 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml
View File

@ -106,30 +106,23 @@
builders:
- revoke-sudo
- shell: |
#!/bin/bash -xe
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
- shell: |
#!/bin/bash -xe
cd gerrit
/usr/local/jenkins/slave_scripts/version-properties.sh
- inject:
properties-file: gerrit/version.properties
- install-buck
- shell: |
#!/bin/bash -xe
export PATH=`pwd`/buck/bin:$PATH
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
/usr/local/jenkins/slave_scripts/version-properties.sh
source version.properites
buck clean
buck build release
- shell: "cp gerrit/buck-out/gen/release.war gerrit/buck-out/gen/gerrit-$PROJECT_VER.war"
cp buck-out/gen/release.war buck-out/gen/gerrit-$PROJECT_VER.war
publishers:
- war:
site: 'tarballs.openstack.org'
warfile: 'gerrit/buck-out/gen/gerrit-${PROJECT_VER}.war'
warfile: 'gerrit/buck-out/gen/gerrit-*.war'
target: 'tarballs/ci/test'
- console-log
@ -145,25 +138,18 @@
builders:
- revoke-sudo
- shell: |
#!/bin/bash -xe
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
- shell: |
#!/bin/bash -xe
cd gerrit
/usr/local/jenkins/slave_scripts/version-properties.sh
- inject:
properties-file: gerrit/version.properties
- install-buck
- shell: |
#!/bin/bash -xe
export PATH=`pwd`/buck/bin:$PATH
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
/usr/local/jenkins/slave_scripts/version-properties.sh
source version.properites
buck clean
buck build release
- shell: "cp gerrit/buck-out/gen/release.war gerrit/buck-out/gen/gerrit-$PROJECT_VER.war"
cp buck-out/gen/release.war buck-out/gen/gerrit-$PROJECT_VER.war
publishers:
- console-log
@ -180,29 +166,22 @@
builders:
- revoke-sudo
- shell: |
#!/bin/bash -xe
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
- shell: |
#!/bin/bash -xe
cd gerrit
/usr/local/jenkins/slave_scripts/version-properties.sh
- inject:
properties-file: gerrit/version.properties
- install-buck
- shell: |
#!/bin/bash -xe
export PATH=`pwd`/buck/bin:$PATH
mkdir -p gerrit
cd gerrit
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
/usr/local/jenkins/slave_scripts/version-properties.sh
source version.properites
buck clean
buck build release
- shell: "cp gerrit/buck-out/gen/release.war gerrit/buck-out/gen/gerrit-$PROJECT_VER.war"
cp gerrit/buck-out/gen/release.war gerrit/buck-out/gen/gerrit-$PROJECT_VER.war
publishers:
- war:
site: 'tarballs.openstack.org'
warfile: 'gerrit/buck-out/gen/gerrit-${PROJECT_VER}.war'
warfile: 'gerrit/buck-out/gen/gerrit-*.war'
target: 'tarballs/ci/gerrit'
- console-log