summaryrefslogtreecommitdiffstats
path: root/job-cfg
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-09 11:19:51 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-09 11:19:51 +0200
commite63cbb31277c92904cb7dd6f5e4b79cfccec2f10 (patch)
tree4c1e06987698dd5044253ab5d13cc3b82ad55569 /job-cfg
parente4c788b026c60a1f58d6386b276a90d8d2aae325 (diff)
downloadjenkins.debian.net-e63cbb31277c92904cb7dd6f5e4b79cfccec2f10.tar.xz
rebootstrap: switch all jobs to be run on profitbricks4 node
Diffstat (limited to 'job-cfg')
-rwxr-xr-xjob-cfg/rebootstrap.yaml.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py
index 6395b3df..37ef5ff5 100755
--- a/job-cfg/rebootstrap.yaml.py
+++ b/job-cfg/rebootstrap.yaml.py
@@ -35,11 +35,6 @@ architectures += mono_architectures
gcc_versions = ("5",)
debbindiff_gcc_versions = ("5",)
-def get_node(arch):
- if arch == "or1k" or arch == "arm64":
- return "profitbricks4"
- return ""
-
print("""
- defaults:
name: rebootstrap
@@ -130,7 +125,8 @@ for arch in sorted(architectures):
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_node: '%(node)s'""" %
+ my_node: '%(node)s'
+ my_wrapper: '/srv/jenkins/bin/jenkins_master_wrapper.sh'""" %
dict(arch=arch,
suffix=arch + "_gcc" + gccver.replace(".", "") + ("_nobiarch" if nobiarch else "") + ("_supported" if supported else "") + ("_debbindiff" if debbindiff else ""),
gccver=gccver,
@@ -140,9 +136,5 @@ for arch in sorted(architectures):
supported_comment=" using the supported method" if supported else "",
debbindiff_value="yes" if debbindiff else "no",
debbindiff_comment=" showing debbindiffs" if debbindiff else "",
- node=get_node(arch)))
- if get_node(arch):
- print(" my_wrapper: '/srv/jenkins/bin/jenkins_master_wrapper.sh'")
- else:
- print(" my_wrapper: '/srv/jenkins/bin/rebootstrap.sh'")
+ node="profitbricks4"))