[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: jenkins_node_wrapper: drop entries for removed jobs
Mattia Rizzolo
gitlab at salsa.debian.org
Wed May 30 00:04:04 BST 2018
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
a6d3ff08 by Mattia Rizzolo at 2018-05-30T00:45:47+02:00
jenkins_node_wrapper: drop entries for removed jobs
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
b169c476 by Mattia Rizzolo at 2018-05-30T01:03:45+02:00
chroot-installation: actually send the job to the remote node through our wrappers…
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
3 changed files:
- bin/jenkins_master_wrapper.sh
- bin/jenkins_node_wrapper.sh
- job-cfg/chroot-installation.yaml.py
Changes:
=====================================
bin/jenkins_master_wrapper.sh
=====================================
--- a/bin/jenkins_master_wrapper.sh
+++ b/bin/jenkins_master_wrapper.sh
@@ -1,7 +1,9 @@
#!/bin/bash
+# vim: set noexpandtab:
# Copyright 2015-2017 Holger Levsen <holger at layer-acht.org>
# 2016 Phil Hands <phil at hands.com>
+# 2018 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv=2
# based on an idea by Peter Palfrader (see bin/jenkins_node_wrapper.sh)
@@ -25,8 +27,9 @@ RETRIEVE_ARTIFACTS=no
# add some more params if needed,
# by default we just use the job name as param
case $JOB_NAME in
- rebootstrap_*) PARAMS="$JOB_NAME $@"
- ;;
+ rebootstrap_*|chroot-installation_*)
+ PARAMS="$JOB_NAME $@"
+ ;;
lvc_*) PARAMS="$JOB_NAME $EXECUTOR_NUMBER TRIGGERING_BRANCH=${TRIGGERING_BRANCH:-} $@"
RETRIEVE_ARTIFACTS=yes
export
=====================================
bin/jenkins_node_wrapper.sh
=====================================
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -1,8 +1,9 @@
#!/usr/bin/env bash
+# vim: set noexpandtab:
# Copyright (c) 2009, 2010, 2012, 2015 Peter Palfrader
# 2015-2017 Holger Levsen
-# 2017 Mattia Rizzolo <mattia at debian.org>
+# 2017-2018 Mattia Rizzolo <mattia at debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -72,6 +73,10 @@ elif [[ "$*" =~ ^rebootstrap_.* ]] ; then
REBOOTSTRAPSH="/srv/jenkins/bin/rebootstrap.sh $@"
export LC_ALL=C
exec $REBOOTSTRAPSH; croak "Exec failed";
+elif [[ "$*" =~ ^chroot-installation_.*maintenance$ ]]; then
+ shift ; exec /srv/jenkins/bin/maintenance.sh $@ ; croak "Exec failed"
+elif [[ "$*" =~ ^chroot-installation_.* ]]; then
+ shift ; exec /srv/jenkins/bin/chroot-installation.sh $@ ; croak "Exec failed"
elif [ "$*" = "reproducible_html_nodes_info" ] ; then
exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed";
elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
@@ -116,14 +121,6 @@ elif [[ "$*" =~ ^reproducible_node_health_check_.*_.* ]] ; then
exec /srv/jenkins/bin/reproducible_node_health_check.sh ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_diffoscope_.*_.* ]] ; then
exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_buster_.*_.* ]] ; then
- exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-buster buster ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_.*_.* ]] ; then
- exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_stretch_.*_.* ]] ; then
- exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-stretch stretch ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_setup_schroot_experimental_.*_.* ]] ; then
- exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_openwrt ]] ; then
=====================================
job-cfg/chroot-installation.yaml.py
=====================================
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -314,7 +314,7 @@ jobs.append({ '{name}_{dist}_{action}': {
'my_description': 'Maintainance job for chroot-installation_{dist}_* jobs, do some cleanups and monitoring so that there is a predictable environment.',
'my_prio': '135',
'my_recipients': 'qa-jenkins-scm at lists.alioth.debian.org',
- 'my_shell': '/srv/jenkins/bin/maintenance.sh chroot-installation_{dist}',
+ 'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh chroot-installation_{dist}',
'my_view': 'jenkins.d.n'}})
@@ -339,7 +339,7 @@ for jobindex, jobspec in enumerate(jobspecs):
'my_prio': 131,
'my_time': '',
'my_recipients': get_recipients('bootstrap'),
- 'my_shell': '/srv/jenkins/bin/chroot-installation.sh {dist} none'+jobspec['s_ext'],
+ 'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh {dist} none'+jobspec['s_ext'],
'my_view': get_view('bootstrap', None),
}}
for (dists, trigs) in js_dists_trigs[jobindex].keys()])
@@ -367,7 +367,7 @@ for jobindex, jobspec in enumerate(jobspecs):
'my_recipients': get_recipients(t)}}
for t in dv_targs],
'my_description': 'Debootstrap {dist}, then install {my_spokenname}'+jobspec['d_ext']+'.',
- 'my_shell': '/srv/jenkins/bin/chroot-installation.sh {dist} {target}'+jobspec['s_ext'],
+ 'my_shell': '/srv/jenkins/bin/jenkins_master_wrapper.sh {dist} {target}'+jobspec['s_ext'],
'my_view': view,
}}
for (dists, view), dv_targs in targets_per_distview[jobindex].items()])
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4aa727a7572745b3be01fcad2784e9db2b7d6ea1...b169c476811a6a401149cef886bad433d8fa75e6
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4aa727a7572745b3be01fcad2784e9db2b7d6ea1...b169c476811a6a401149cef886bad433d8fa75e6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180529/30b4c1b6/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list