diff options
| -rw-r--r-- | TODO | 20 | ||||
| -rwxr-xr-x | bin/reproducible_master_wrapper.sh | 22 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 2 |
3 files changed, 25 insertions, 19 deletions
@@ -308,7 +308,8 @@ properties: * use ftp.us.d.o on these machines * use http://10.0.0.15:8000/ as proxy -* next: run pbuilder create jobs via remote job scheduling as described below +* next: fix dpkg '1.18.1.0~reproducible5' to not ftbfs +* next: run pbuilder create jobs via remote job scheduling * then: repo overview with binary packages * then: armhf scheduling (only for testing for now, introduce "arch-factor", eg. amd64=10 and armhf=3, to schedule less on some archs) * then: armhf building - run the job on jenkins.d.n and build1 on one host and build2 on another and then run debbindiff on jenkins.d.n… @@ -317,23 +318,6 @@ properties: ** http://munin-monitoring.org/wiki/Native_ssh ** http://guide.munin-monitoring.org/en/latest/example/transport/ssh.html -==== remote jenkins job scheduling: ----- -<weasel> | h01ger: I have a slave configured, named buildbot.pixelminers. -<weasel> remote root is /home/jenkins/pseudo-hosts/buildbot.pixelminers.net -<weasel> and launch command is ssh localhost ~/pseudo-hosts/jenkins-tools/slaves/linux/start-slave.sh -<weasel> https://www.palfrader.org/volatile/2015-06-06-sP55pjoGcN8/screenshot.png -<weasel> https://gitweb.torproject.org/project/jenkins/tools.git/tree/slaves/linux -<weasel> - job: -<weasel> name: tor-ci-freebsd-amd64-master -<weasel> project-type: freestyle -<weasel> node: freebsd-amd64 -<weasel> builders: -<weasel> - shell: '~/jenkins-tools/slaves/other/build-wrapper' -<weasel> https://gitweb.torproject.org/project/jenkins/tools.git/tree/slaves/other/build-wrapper -<weasel> https://gitweb.torproject.org/project/jenkins/tools.git/tree/slaves/other/tor-ci-freebsd-amd64-master/build ----- - === qa.debian.org* * udd-versionskew: explain jobs in README diff --git a/bin/reproducible_master_wrapper.sh b/bin/reproducible_master_wrapper.sh new file mode 100755 index 00000000..c49fd34c --- /dev/null +++ b/bin/reproducible_master_wrapper.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -u +set -e + +case "$NODE_NAME" in + bpi0-armhf-rb.debian.net) + exec ssh -p 2222 jenkins@$NODE_NAME "$JOB_NAME" + ;; + hb0-armhf-rb.debian.net) + exec ssh -p 2224 jenkins@$NODE_NAME "$JOB_NAME" + ;; + wbq0-armhf-rb.debian.net) + exec ssh -p 2225 jenkins@$NODE_NAME "$JOB_NAME" + ;; + cbxi4pro0-armhf-rb.debian.net) + exec ssh -p 2226 jenkins@$NODE_NAME "$JOB_NAME" + ;; + *) + echo >&2 "Unknown node $NODE_NAME." + exit 1 +esac diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index a676227e..666b9fe1 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -344,7 +344,7 @@ - '{name}_setup_pbuilder_testing_armhf_bpi0': my_description: 'Setup and update pbuilder for reproducible builds of packages from testing as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' my_timed: '23 0,4,8,12,16,20 * * *' - my_shell: '/srv/jenkins/bin/reproducible_node_wrapper.sh' + my_shell: '/srv/jenkins/bin/reproducible_master_wrapper.sh' my_recipients: 'jenkins+debian-reproducible qa-jenkins-scm@lists.alioth.debian.org' - '{name}_setup_pbuilder_unstable': my_description: 'Setup and update pbuilder for reproducible builds of packages from unstable as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' |