[Qa-jenkins-scm] [jenkins.debian.net] 02/05: reproducible: test new suite: 'testing'
Holger Levsen
holger at moszumanska.debian.org
Wed Mar 11 21:58:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit a4909b6902bac9d5fd3e19ec71624cc689867041
Author: Holger Levsen <holger at layer-acht.org>
Date: Wed Mar 11 22:43:11 2015 +0100
reproducible: test new suite: 'testing'
---
bin/make_graph.py | 10 +++++-----
bin/reproducible_common.py | 2 +-
bin/reproducible_common.sh | 2 +-
bin/reproducible_html_graphs.sh | 10 +++++++---
bin/reproducible_html_repo_stats.sh | 4 ++--
job-cfg/reproducible.yaml | 18 ++++++++++++++++++
6 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/bin/make_graph.py b/bin/make_graph.py
index dd4d3dd..fae1ddc 100755
--- a/bin/make_graph.py
+++ b/bin/make_graph.py
@@ -30,11 +30,11 @@ def main():
# thanks to http://tango.freedesktop.org/Generic_Icon_Theme_Guidelines for those nice colors
if int(colors) < 6:
r('palette(c("#4e9a06", "#f57900", "#cc0000", "#2e3436", "#888a85"))')
- elif int(colors) == 8: # once we have 12 colors, add: "#8ae234", "#fcaf3e", "#ef2929", "#888a85"
- r('palette(c("#4e9a06", "#73d216", \
- "#ce5c00", "#f57900", \
- "#a40000", "#cc0000", \
- "#2e3436", "#555753" ))')
+ elif int(colors) == 12:
+ r('palette(c("#4e9a06", "#73d216", "#8ae234", \
+ "#ce5c00", "#f57900", "#fcaf3e", \
+ "#a40000", "#cc0000", "#ef2929", \
+ "#2e3436", "#555753", "#888a85" ))')
else:
r('palette(c("#fce94f", "#c4a000", "#eeeeec", "#babdb6", \
"#fcaf3e", "#ce5c00", "#ad7fa8", "#5c3566", \
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index e33d24f..0745612 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -25,7 +25,7 @@ DEBUG = False
QUIET = False
# tested suites
-SUITES = ['sid', 'experimental']
+SUITES = ['sid', 'testing', 'experimental']
# tested arches
ARCHES = ['amd64']
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 3e17d79..706d76a 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -40,7 +40,7 @@ DBDCHROOT_WRITELOCK=/var/lib/jenkins/reproducible-dbdchroot.writelock
JENKINS_URL=${JENKINS_URL:0:-1}
# tested suites
-SUITES="sid experimental"
+SUITES="sid testing experimental"
# tested arches
ARCHES="amd64"
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index d616664..ee1c3ed 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -281,12 +281,16 @@ create_png_from_table() {
sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "select s.datum,
s.reproducible as 'reproducible_sid',
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e where s.datum=e.datum and suite='experimental'),0) as 'reproducible_experimental',
+ COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e where s.datum=e.datum and suite='testing'),0) as 'reproducible_testing',
s.unreproducible as 'unreproducible_sid',
(SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS unreproducible_experimental,
+ (SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS unreproducible_testing,
s.FTBFS as 'FTBFS_sid',
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS FTBFS_experimental,
+ (SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS FTBFS_testing,
s.other as 'other_sid',
- (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS other_experimental
+ (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS other_experimental,
+ (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS other_testing
FROM stats_builds_per_day AS s WHERE s.suite='sid' GROUP BY s.datum" >> ${TABLE[$1]}.csv
elif [ $1 -eq 2 ] ; then
sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT datum, ((oldest_reproducible + oldest_unreproducible + oldest_FTBFS)/3) FROM ${TABLE[$1]} ${WHERE_EXTRA} ORDER BY datum" >> ${TABLE[$1]}.csv
@@ -531,8 +535,8 @@ for SUITE in $SUITES ; do
update_suite_stats
gather_suite_stats
create_suite_stats_page
- if [ "$SUITE" = "experimental" ] ; then
- # no pkg sets in experimental
+ if [ "$SUITE" != "sid" ] ; then
+ # FIXME: should be: no pkg sets in experimental
continue
fi
update_meta_pkg_stats
diff --git a/bin/reproducible_html_repo_stats.sh b/bin/reproducible_html_repo_stats.sh
index 966b270..72cd4e8 100755
--- a/bin/reproducible_html_repo_stats.sh
+++ b/bin/reproducible_html_repo_stats.sh
@@ -10,8 +10,8 @@ common_init "$@"
# common code defining db access
. /srv/jenkins/bin/reproducible_common.sh
-SUITE="sid"
-ARCH="amd64"
+SUITE="sid" # for links in page
+ARCH="amd64" # same
init_html
VIEW=repo_stats
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 6d7277e..ecc21ac 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -129,6 +129,10 @@
- job-template:
defaults: reproducible
+ name: '{name}_setup_pbuilder_testing'
+
+- job-template:
+ defaults: reproducible
name: '{name}_setup_pbuilder_experimental'
- job-template:
@@ -141,6 +145,10 @@
- job-template:
defaults: reproducible
+ name: '{name}_setup_schroot_testing'
+
+- job-template:
+ defaults: reproducible
name: '{name}_setup_schroot_experimental'
- job-template:
@@ -206,6 +214,11 @@
my_timed: '5 0,4,8,12,16,20 * * *'
my_shell: '/srv/jenkins/bin/reproducible_maintainance.sh'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
+ - '{name}_setup_pbuilder_testing':
+ 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_setup_pbuilder.sh testing'
+ my_recipients: 'jenkins+debian-reproducible qa-jenkins-scm at lists.alioth.debian.org'
- '{name}_setup_pbuilder_sid':
my_description: 'Setup and update pbuilder for reproducible builds of packages from sid as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
my_timed: '23 0,4,8,12,16,20 * * *'
@@ -226,6 +239,11 @@
my_timed: '23 1 * * *'
my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-sid sid reproducible'
my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
+ - '{name}_setup_schroot_testing':
+ my_description: 'Setup testing schroot for fetching source packages for the builder jobs.'
+ my_timed: '23 1 * * *'
+ my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-testing testing reproducible'
+ my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
- '{name}_setup_schroot_experimental':
my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.'
my_timed: '23 1 * * *'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list