diff options
author | Lars Wirzenius <liw@liw.fi> | 2012-08-30 09:46:29 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2012-08-30 09:46:29 +0100 |
commit | 82df80f3c7e00da0ec8c25687dccdf618dc3d41c (patch) | |
tree | 7fb3d4e745957830b818107f58fdd715e0161e94 /jenkinstool | |
parent | a23103f703a9b2ab6bc56767115192b873ede3b9 (diff) | |
download | jenkinstool-82df80f3c7e00da0ec8c25687dccdf618dc3d41c.tar.gz |
Fix prelude to work on remote hosts wrt vcs checkout
Diffstat (limited to 'jenkinstool')
-rwxr-xr-x | jenkinstool | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/jenkinstool b/jenkinstool index 8c0fb54..ad141c9 100755 --- a/jenkinstool +++ b/jenkinstool @@ -27,6 +27,10 @@ from xml.etree import ElementTree as ET import simplejenkinsapi +have_vcs_copy = ''' +have_vcs_copy=yes +''' + prelude = ''' set -eu @@ -79,9 +83,12 @@ project_url="%(global.artifacts-url)s/$project" vcsworkspace="/var/lib/jenkins/workspace/${project}_localhost_vcs-update/" workdir="$(pwd)" -if [ -e "$vcsworkspace" ] +if [ -e "$vcsworkspace" ] || [ "$have_vcs_copy" = yes ]] then - cd "$vcsworkspace" + if [ -e "$vcsworkspace" ] + then + cd "$vcsworkspace" + fi # Split into two so that if getting the upstream version fails, the # script fails. @@ -378,7 +385,7 @@ sudo apt-get --no-remove --allow-unauthenticated -y upgrade self.add_get_source_from_vcs(jc) self.add_rsync_workspace_to_target(jc) if not self.pretend: - jc.add_ssh_command(prelude + ''' + jc.add_ssh_command(have_vcs_copy + prelude + ''' missing="$(dpkg-checkbuilddeps 2>&1 | sed -n '/^.*: Unmet build dependencies: /s///p' | sed 's/([^)]*)//g' | @@ -440,7 +447,7 @@ fi self.add_clear_workspace(jc) self.add_get_source_from_vcs(jc) self.add_rsync_workspace_to_target(jc) - jc.add_ssh_command(prelude + '''\ + jc.add_ssh_command(have_vcs_copy + prelude + '''\ if url_exists "$dsc_url" then echo "$dsc_url already exists, not rebuilding" @@ -478,7 +485,7 @@ fi self.add_rsync_workspace_to_target(jc) - script = prelude + script = have_vcs_copy + prelude if build_all: script += ''' if grep '^Architecture:.* any' debian/control > /dev/null |