Update groups gating scripts

Community portal build process failed due php package deployment
permission errors. This patch add php5-cli package to jenkins slave
and relocate building script from groups project to groups.yaml file.

Change-Id: I462be6bf1ea4e647e262f15427f74fab36e9c5d6
Closes-Bug: 1278344
This commit is contained in:
Marton Kiss 2014-02-12 12:04:20 +01:00
parent 5277291ff2
commit 15761d181a
4 changed files with 35 additions and 16 deletions

View File

@ -50,6 +50,8 @@ class jenkins::params {
$unzip_package = 'unzip' $unzip_package = 'unzip'
$xslt_package = 'libxslt' $xslt_package = 'libxslt'
$xvfb_package = 'xorg-x11-server-Xvfb' $xvfb_package = 'xorg-x11-server-Xvfb'
# PHP package, used for community portal
$php5_cli_package = 'php-cli'
# For Tooz unit tests # For Tooz unit tests
# FIXME: No zookeeper packages on RHEL # FIXME: No zookeeper packages on RHEL
#$zookeeper_package = 'zookeeper-server' #$zookeeper_package = 'zookeeper-server'
@ -126,6 +128,8 @@ class jenkins::params {
$unzip_package = 'unzip' $unzip_package = 'unzip'
$xslt_package = 'xsltproc' $xslt_package = 'xsltproc'
$xvfb_package = 'xvfb' $xvfb_package = 'xvfb'
# PHP package, used for community portal
$php5_cli_package = 'php5-cli'
# For [tooz, taskflow, nova] using zookeeper in unit tests # For [tooz, taskflow, nova] using zookeeper in unit tests
$zookeeper_package = 'zookeeperd' $zookeeper_package = 'zookeeperd'
$cgroups_package = 'cgroup-bin' $cgroups_package = 'cgroup-bin'

View File

@ -63,6 +63,7 @@ class jenkins::slave(
$::jenkins::params::unzip_package, $::jenkins::params::unzip_package,
$::jenkins::params::xslt_package, # for building openstack docs $::jenkins::params::xslt_package, # for building openstack docs
$::jenkins::params::xvfb_package, # for selenium tests $::jenkins::params::xvfb_package, # for selenium tests
$::jenkins::params::php5_cli_package, # for community portal build
] ]
if ($bare == false) { if ($bare == false) {

View File

@ -1,12 +1,16 @@
- job: - job:
name: gate-groups-unittests name: gate-groups-unittests
node: bare-precise node: '{node}'
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
./scripts/bootstrap.sh #!/bin/bash -xe
./scripts/gate-build.sh # fetch drush
mkdir drush
curl -L https://github.com/drush-ops/drush/archive/6.0.0.tar.gz | tar -xz -C drush --strip 1
# build distribution
./drush/drush make build-groups.make dist
publishers: publishers:
- console-log - console-log
- coverage-log - coverage-log
@ -20,21 +24,29 @@
- job-template: - job-template:
name: 'groups-release-{branch-designator}' name: 'groups-release-{branch-designator}'
node: bare-precise node: '{node}'
builders: builders:
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
./script/bootstrap.sh /usr/local/jenkins/slave_scripts/maven-properties.sh
ARCHIVE_NAME={name} - inject:
if [ "$BRANCH" != "master" ] ; then properties-file: maven.properties
BRANCH_PATH=`echo $ZUUL_REFNAME | tr / -` - shell: |
ARCHIVE_NAME={name}-{branch-designator} #!/bin/bash -xe
fi # fetch drush
drush make build-groups.make dist mkdir drush
tar -czf $ARCHIVE_NAME.tar.gz dist/ curl -L https://github.com/drush-ops/drush/archive/6.0.0.tar.gz | tar -xz -C drush --strip 1
mv $ARCHIVE_NAME.tar.gz dist/ # build distribution
./drush/drush make build-groups.make dist
# Clean/create a tarball directory
rm -rf tarballs
mkdir -p tarballs
# Create an archive tarball.
tar -czf groups-$PROJECT_VER.tar.gz dist/
cp groups-$PROJECT_VER.tar.gz tarballs/groups-latest.tar.gz
mv groups-$PROJECT_VER.tar.gz tarballs/
publishers: publishers:
- console-log - console-log
- coverage-log - coverage-log
@ -45,6 +57,7 @@
source: './reports/**' source: './reports/**'
keep-hierarchy: true keep-hierarchy: true
copy-after-failure: true copy-after-failure: true
- tarball: - target: 'tarballs/groups/'
project: '{name}' source: 'tarballs/*.tar.gz'
site: '{tarball-site}' keep-hierarchy: false
copy-after-failure: false

View File

@ -2152,6 +2152,7 @@
tarball-site: tarballs.openstack.org tarball-site: tarballs.openstack.org
jobs: jobs:
- gate-groups-unittests
- 'groups-release-{branch-designator}': - 'groups-release-{branch-designator}':
branch-designator: 'master' branch-designator: 'master'
- 'groups-release-{branch-designator}': - 'groups-release-{branch-designator}':