summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-04-26 12:23:18 +0200
committerHolger Levsen <holger@layer-acht.org>2015-04-26 12:23:18 +0200
commit160e9685c6df74dc4a0897d16eb31552d466152c (patch)
tree71a1094bf4c46a4c4e538fc18a4f014bf6db96c2
parent3ba178bbb83ba5a347eb680191d03d6380d43f4f (diff)
downloadjenkins.debian.net-160e9685c6df74dc4a0897d16eb31552d466152c.tar.xz
dpkg-find-trigger-cycles: drop stretch schroot, it's enough to run them in a jessie schroot
-rw-r--r--TODO1
-rw-r--r--job-cfg/dpkg.yaml14
2 files changed, 4 insertions, 11 deletions
diff --git a/TODO b/TODO
index c9e551c5..95414656 100644
--- a/TODO
+++ b/TODO
@@ -88,6 +88,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
* bin/g-i-installation: use lvcreate without --virtualsize
* check if the sudo workaround in bin/g-i-installation is still needed: 'guestmount -o uid=$(id -u) -o gid=$(id -g)' would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed.
* reproducible: let the scheduler use the xz-compressed file instead of the gzip one. This is because of missing lzma module in wheezy's python.
+* job-cfg/dpkg.yaml: drop source:jenkins-dpkg-jessie, these jobs dont need a schroot
=== To be done once bugs are fixed
diff --git a/job-cfg/dpkg.yaml b/job-cfg/dpkg.yaml
index 51c2f8d8..e25f5475 100644
--- a/job-cfg/dpkg.yaml
+++ b/job-cfg/dpkg.yaml
@@ -48,10 +48,6 @@
defaults: dpkg
name: '{name}_setup_schroot_jessie'
-- job-template:
- defaults: dpkg
- name: '{name}_setup_schroot_stretch'
-
- project:
name: dpkg
jobs:
@@ -62,17 +58,13 @@
- '{name}_stretch_find_trigger_cycles':
my_description: 'Find dpkg trigger cycles in Debian stretch.'
my_time: '0 10 * * *'
- my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-stretch /srv/jenkins/bin/find_dpkg_trigger_cycles.sh stretch'
+ my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-jessie /srv/jenkins/bin/find_dpkg_trigger_cycles.sh stretch'
- '{name}_sid_find_trigger_cycles':
my_description: 'Find dpkg trigger cycles in Debian sid.'
my_time: '0 12 * * *'
- my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-stretch /srv/jenkins/bin/find_dpkg_trigger_cycles.sh unstable'
+ my_shell: 'schroot --directory /tmp -c source:jenkins-dpkg-jessie /srv/jenkins/bin/find_dpkg_trigger_cycles.sh unstable'
- '{name}_setup_schroot_jessie':
- my_description: 'Setup schroot for running the dpkg_jessie_find_trigger_cycles and reproducible_create_meta_pkg_sets jobs in a jessie environment.'
+ my_description: 'Setup schroot for running the dpkg_(jessie|stretch|sid)_find_trigger_cycles and reproducible_create_meta_pkg_sets jobs in a jessie environment.'
my_time: '23 8 * * 1'
my_shell: '/srv/jenkins/bin/schroot-create.sh dpkg-jessie jessie python apt-file dose-extra'
- - '{name}_setup_schroot_stretch':
- my_description: 'Setup schroot for running the dpkg_sid_find_trigger_cycles and dpkg_stretch_find_trigger_cycles jobs in a stretch environment.'
- my_time: '23 8 * * 1'
- my_shell: '/srv/jenkins/bin/schroot-create.sh dpkg-stretch stretch python apt-file dose-extra'