summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2015-08-30 20:57:13 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-01 16:03:04 +0200
commit031bcbe5e9ff856d79f4b1154280d4381401ee1f (patch)
tree7846915b9a49c4521674a994184d378220d0077a
parent1139a3ff330b75875e20382b750628e405b9c976 (diff)
downloadjenkins.debian.net-031bcbe5e9ff856d79f4b1154280d4381401ee1f.tar.xz
rebootstrap: move or1k jobs to profitbricks4 node
* Set node attribute. * Prepend reproducible_master_wrapper.sh to the shell command and rely on it ignoring the arguments. Another script shall reconstruct the invocation from the job name.
-rwxr-xr-xjob-cfg/rebootstrap.yaml.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py
index 162beb8f..da3bae3e 100755
--- a/job-cfg/rebootstrap.yaml.py
+++ b/job-cfg/rebootstrap.yaml.py
@@ -35,6 +35,11 @@ architectures += mono_architectures
gcc_versions = ("5",)
debbindiff_gcc_versions = ("5",)
+def get_node(arch):
+ if arch == "or1k":
+ return "profitbricks4"
+ return ""
+
print("""
- defaults:
name: rebootstrap
@@ -73,7 +78,7 @@ print("""
branches:
- '{my_branchname}'
builders:
- - shell: 'export LC_ALL=C ; /srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh HOST_ARCH={my_arch} {my_params}'
+ - shell: '{my_wrapper} LC_ALL=C /srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh HOST_ARCH={my_arch} {my_params}'
publishers:
- logparser:
parse-rules: '/srv/jenkins/logparse/rebootstrap.rules'
@@ -83,6 +88,7 @@ print("""
recipients: 'jenkins+debian-bootstrap helmutg@debian.org'
triggers:
- pollscm: '*/6 * * * *'
+ node: '{my_node}'
""")
for arch in sorted(architectures):
@@ -123,7 +129,8 @@ for arch in sorted(architectures):
my_arch: '%(arch)s'
my_params: 'GCC_VER=%(gccver)s ENABLE_MULTILIB=%(multilib_value)s ENABLE_MULTIARCH_GCC=%(multiarch_gcc_value)s ENABLE_DEBBINDIFF=%(debbindiff_value)s'
my_description: 'Verify bootstrappability of Debian using gcc-%(gccver)s%(nobiarch_comment)s for %(arch)s%(supported_comment)s%(debbindiff_comment)s'
- my_branchname: 'jenkins_%(suffix)s'""" %
+ my_branchname: 'jenkins_%(suffix)s'
+ my_node: '%(node)s'""" %
dict(arch=arch,
suffix=arch + "_gcc" + gccver.replace(".", "") + ("_nobiarch" if nobiarch else "") + ("_supported" if supported else "") + ("_debbindiff" if debbindiff else ""),
gccver=gccver,
@@ -132,4 +139,7 @@ for arch in sorted(architectures):
multiarch_gcc_value="no" if supported else "yes",
supported_comment=" using the supported method" if supported else "",
debbindiff_value="yes" if debbindiff else "no",
- debbindiff_comment=" showing debbindiffs" if debbindiff else ""))
+ debbindiff_comment=" showing debbindiffs" if debbindiff else "",
+ node=get_node(arch)))
+ if get_node(arch):
+ print(" my_wrapper: '/srv/jenkins/bin/reproducible_master_wrapper.sh'")