summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_update_schroot.sh16
-rw-r--r--job-cfg/reproducible.yaml22
3 files changed, 2 insertions, 37 deletions
diff --git a/TODO b/TODO
index f638fdc7..9edbbcee 100644
--- a/TODO
+++ b/TODO
@@ -117,7 +117,6 @@ properties:
=== reproducible
-* scheduler.py calls "apt-get update" on the host, should do so in the schroots. once this happens, remove the update schroot script and jobs again
* run debbindiff against .changes files in current directory, instead of $LONGPATHES (due to #764459)
* reproducible: dont delete userContent/$pkg on build begin..
diff --git a/bin/reproducible_update_schroot.sh b/bin/reproducible_update_schroot.sh
deleted file mode 100755
index 37ce7c48..00000000
--- a/bin/reproducible_update_schroot.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 Holger Levsen <holger@layer-acht.org>
-# released under the GPLv=2
-
-DEBUG=false
-. /srv/jenkins/bin/common-functions.sh
-common_init "$@"
-
-# common code defining db access
-. /srv/jenkins/bin/reproducible_common.sh
-
-# do the upgrade
-schroot --directory /root -u root -c source:jenkins-$1 -- apt-get update
-schroot --directory /root -u root -c source:jenkins-$1 -- apt-get -y -u dist-upgrade
-schroot --directory /root -u root -c source:jenkins-$1 -- apt-get --purge autoremove
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 1791d4ec..4dd2b980 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -145,14 +145,6 @@
- job-template:
defaults: reproducible
- name: '{name}_update_schroot_sid'
-
-- job-template:
- defaults: reproducible
- name: '{name}_update_schroot_experimental'
-
-- job-template:
- defaults: reproducible
name: '{name}_scheduler'
- job-template:
@@ -231,24 +223,14 @@
my_recipients: 'holger@layer-acht.org'
- '{name}_setup_schroot_sid':
my_description: 'Setup sid schroot for fetching source packages for the builder jobs.'
- my_timed: '23 1 * * 0'
+ my_timed: '23 1 * * *'
my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-sid sid reproducible'
my_recipients: 'holger@layer-acht.org'
- '{name}_setup_schroot_experimental':
my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.'
- my_timed: '23 1 * * 0'
+ my_timed: '23 1 * * *'
my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-experimental experimental reproducible'
my_recipients: 'holger@layer-acht.org'
- - '{name}_update_schroot_sid':
- my_description: 'Update sid schroot for fetching source packages for the builder jobs.'
- my_timed: '23 5,10,16,22 * * *' # ftp.de.debian.org runs mirror updates at 03:25, 09:25, 15:25 and 21:25 UTC and usually they run 10m...
- my_shell: '/srv/jenkins/bin/reproducible_update_schroot.sh reproducible-sid'
- my_recipients: 'holger@layer-acht.org'
- - '{name}_update_schroot_experimental':
- my_description: 'Update experimental schroot for fetching source packages for the builder jobs.'
- my_timed: '23 4,10,16,22 * * *' # ftp.de.debian.org runs mirror updates at 03:25, 09:25, 15:25 and 21:25 UTC and usually they run 10m...
- my_shell: '/srv/jenkins/bin/reproducible_update_schroot.sh reproducible-experimental'
- my_recipients: 'holger@layer-acht.org'
- '{name}_scheduler':
my_description: 'Schedule packages to be tested for reproducibility.'
my_timed: '42 * * * *'