Use slave_scripts rather than script text.
Change-Id: Ie67c216df66b905233d6f93f3568eab046e88b39
This commit is contained in:
parent
5b32163857
commit
e9e261571e
@ -6,18 +6,6 @@
|
||||
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
|
||||
</hudson.plugins.copyartifact.CopyArtifact>
|
||||
<hudson.tasks.Shell>
|
||||
<command># Support jobs, such as nova-docs, which are not yet triggered by gerrit
|
||||
if [ "x$GERRIT_BRANCH" = "x" ] ; then
|
||||
GERRIT_BRANCH=master
|
||||
fi
|
||||
mv jenkins_venvs/$GERRIT_BRANCH/.cache.bundle .
|
||||
rm -fr jenkins_venvs
|
||||
|
||||
if [ -f tools/test-requires -a \
|
||||
`git diff HEAD^1 tools/test-requires 2>/dev/null | wc -l` -gt 0 -o \
|
||||
`git diff HEAD^1 tools/pip-requires 2>/dev/null | wc -l` -gt 0 ]
|
||||
then
|
||||
rm .cache.bundle
|
||||
fi</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/copy-bundle.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
@ -1,9 +1,4 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>if [ -f .cache.bundle ] ; then
|
||||
tox -ejenkinscover
|
||||
else
|
||||
tox -evenv -- nosetests test/unit --with-xcoverage --cover-erase --cover-package=<%= project %>
|
||||
|
||||
fi</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/run-cover.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
||||
|
@ -1,10 +1,4 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>mkdir -p doc/build
|
||||
export HUDSON_PUBLISH_DOCS=1
|
||||
if [ -f .cache.bundle ] ; then
|
||||
tox -ejenkinsvenv python setup.py build_sphinx
|
||||
else
|
||||
tox -evenv python setup.py build_sphinx
|
||||
fi</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/run-docs.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
||||
|
@ -1,31 +1,3 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash -xe
|
||||
|
||||
if [ -z "$GERRIT_NEWREV" ] && [ -z "$GERRIT_REFSPEC" ]
|
||||
then
|
||||
echo "This job may only be triggered by Gerrit."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -e .git ]]
|
||||
then
|
||||
git clone https://review.<%= site %>.org/p/$GERRIT_PROJECT .
|
||||
fi
|
||||
git remote update || git remote update # attempt to work around bug #925790
|
||||
git reset --hard
|
||||
git clean -x -f -d -q
|
||||
|
||||
if [ ! -z "$GERRIT_REFSPEC" ]
|
||||
then
|
||||
git checkout $GERRIT_BRANCH
|
||||
git reset --hard remotes/origin/$GERRIT_BRANCH
|
||||
git clean -x -f -d -q
|
||||
git fetch https://review.<%= site %>.org/p/$GERRIT_PROJECT $GERRIT_REFSPEC
|
||||
git merge FETCH_HEAD
|
||||
else
|
||||
git checkout $GERRIT_NEWREV
|
||||
git reset --hard $GERRIT_NEWREV
|
||||
git clean -x -f -d -q
|
||||
fi
|
||||
</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/gerrit-git-prep.sh <%= site %> </command>
|
||||
</hudson.tasks.Shell>
|
||||
|
@ -1,9 +1,3 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/sh
|
||||
|
||||
if [ -f .cache.bundle ] ; then
|
||||
tox -v -ejenkinspep8 | tee pep8.txt
|
||||
else
|
||||
tox -v -epep8 | tee pep8.txt
|
||||
fi</command>
|
||||
<command>tox -v -epep8 | tee pep8.txt</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
@ -1,8 +1,3 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>if [ -f .cache.bundle ]
|
||||
then
|
||||
tox -v -ejenkinspy26
|
||||
else
|
||||
tox -v -epy26
|
||||
fi</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/run-tox.sh 26</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
@ -1,8 +1,3 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>if [ -f .cache.bundle ]
|
||||
then
|
||||
tox -v -ejenkinspy27
|
||||
else
|
||||
tox -v -epy27
|
||||
fi</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/run-tox.sh 26</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
@ -1,4 +1,3 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>~/openstack-ci/slave_scripts/create-tarball.sh
|
||||
</command>
|
||||
<command>bash -x ~/openstack-ci/slave_scripts/create-tarball.sh</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
Loading…
Reference in New Issue
Block a user