From 658ffb103ece627fc8e924ba3cefe81aa55d24cc Mon Sep 17 00:00:00 2001
From: Valerie R Young <spectranaut@riseup.net>
Date: Fri, 17 Jun 2016 15:04:34 -0400
Subject: reproducible debian: move META_PKGSET definition to csv file

Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Holger Levsen <holger@layer-acht.org>
---
 bin/meta_pkgset.csv        | 42 +++++++++++++++++++++++++++++++++++++++
 bin/reproducible_common.py |  9 +++++++++
 bin/reproducible_common.sh | 49 ++++++----------------------------------------
 3 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 bin/meta_pkgset.csv

(limited to 'bin')

diff --git a/bin/meta_pkgset.csv b/bin/meta_pkgset.csv
new file mode 100644
index 00000000..c876eecc
--- /dev/null
+++ b/bin/meta_pkgset.csv
@@ -0,0 +1,42 @@
+1,essential
+2,required
+3,build-essential
+4,build-essential-depends
+5,popcon_top1337-installed-sources
+6,key_packages
+7,installed_on_debian.org
+8,had_a_DSA
+9,cii-census
+10,gnome
+11,gnome_build-depends
+12,kde
+13,kde_build-depends
+14,mate
+15,mate_build-depends
+16,xfce
+17,xfce_build-depends
+18,freedombox
+19,freedombox_build-depends
+20,grml
+21,grml_build-depends
+22,tails
+23,tails_build-depends
+24,subgraph_OS
+25,subgraph_OS_build-depends
+26,maint_debian-boot
+27,maint_debian-med
+28,maint_debian-ocaml
+29,maint_debian-python
+30,maint_debian-qa
+31,maint_debian-science
+32,maint_debian-x
+33,maint_lua
+34,maint_pkg-fonts-devel
+35,maint_pkg-games-devel
+36,maint_pkg-golang-maintainers
+37,maint_pkg-haskell-maintainers
+38,maint_pkg-java-maintainers
+39,maint_pkg-javascript-devel
+40,maint_pkg-perl-maintainers
+41,maint_pkg-php-pear
+42,maint_pkg-ruby-extras-maintainers
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index d9704052..cc69c95a 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -13,6 +13,7 @@
 import os
 import re
 import sys
+import csv
 import json
 import errno
 import atexit
@@ -75,6 +76,13 @@ REPRODUCIBLE_URL = 'https://tests.reproducible-builds.org'
 DEBIAN_URL = 'https://tests.reproducible-builds.org/debian'
 JENKINS_URL = 'https://jenkins.debian.net'
 
+# global package set definitions
+# for unknown historical reasons the meta_pkgset list is 1-indexed
+META_PKGSET = {}
+with open(os.path.join(BIN_PATH, './meta_pkgset.csv'), newline='') as f:
+    for line in csv.reader(f):
+        META_PKGSET[int(line[0])] = line[1]
+
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group()
 group.add_argument("-d", "--debug", action="store_true")
@@ -520,6 +528,7 @@ def get_status_icon(status):
         log.error('Status ' + status + ' not recognized')
         return (status, '', spokenstatus)
 
+
 def strip_epoch(version):
     """
     Stip the epoch out of the version string. Some file (e.g. buildlogs, debs)
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 6e1025c9..8b382c23 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -41,6 +41,7 @@ REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
 DBDSUITE="unstable"
+BIN_PATH=/srv/jenkins/bin
 
 # Debian suites being tested
 SUITES="testing unstable experimental"
@@ -96,49 +97,11 @@ TABLE[7]=stats_bugs_state
 TABLE[8]=stats_bugs_sin_ftbfs
 TABLE[9]=stats_bugs_sin_ftbfs_state
 
-# known package sets
-META_PKGSET[1]="essential"
-META_PKGSET[2]="required"
-META_PKGSET[3]="build-essential"
-META_PKGSET[4]="build-essential-depends"
-META_PKGSET[5]="popcon_top1337-installed-sources"
-META_PKGSET[6]="key_packages"
-META_PKGSET[7]="installed_on_debian.org"
-META_PKGSET[8]="had_a_DSA"
-META_PKGSET[9]="cii-census"
-META_PKGSET[10]="gnome"
-META_PKGSET[11]="gnome_build-depends"
-META_PKGSET[12]="kde"
-META_PKGSET[13]="kde_build-depends"
-META_PKGSET[14]="mate"
-META_PKGSET[15]="mate_build-depends"
-META_PKGSET[16]="xfce"
-META_PKGSET[17]="xfce_build-depends"
-META_PKGSET[18]="freedombox"
-META_PKGSET[19]="freedombox_build-depends"
-META_PKGSET[20]="grml"
-META_PKGSET[21]="grml_build-depends"
-META_PKGSET[22]="tails"
-META_PKGSET[23]="tails_build-depends"
-META_PKGSET[24]="subgraph_OS"
-META_PKGSET[25]="subgraph_OS_build-depends"
-META_PKGSET[26]="maint_debian-boot"
-META_PKGSET[27]="maint_debian-med"
-META_PKGSET[28]="maint_debian-ocaml"
-META_PKGSET[29]="maint_debian-python"
-META_PKGSET[30]="maint_debian-qa"
-META_PKGSET[31]="maint_debian-science"
-META_PKGSET[32]="maint_debian-x"
-META_PKGSET[33]="maint_lua"
-META_PKGSET[34]="maint_pkg-fonts-devel"
-META_PKGSET[35]="maint_pkg-games-devel"
-META_PKGSET[36]="maint_pkg-golang-maintainers"
-META_PKGSET[37]="maint_pkg-haskell-maintainers"
-META_PKGSET[38]="maint_pkg-java-maintainers"
-META_PKGSET[39]="maint_pkg-javascript-devel"
-META_PKGSET[40]="maint_pkg-perl-maintainers"
-META_PKGSET[41]="maint_pkg-php-pear"
-META_PKGSET[42]="maint_pkg-ruby-extras-maintainers"
+# package sets defined in meta_pkgsets.csv
+while IFS=, read col1 col2
+do
+	META_PKGSET[$col1]=$col2
+done < $BIN_PATH/meta_pkgset.csv
 
 # sleep 1-23 secs to randomize start times
 delay_start() {
-- 
cgit v1.2.3-70-g09d2