devuan-releasebot

commit 2ce53612596efc8b94298c548cf3d487b185e375
parent d6530c4856eacce47fd403329218d95504a8c3a9
Author: parazyd <parazyd@dyne.org>
Date:   Thu, 27 Jul 2017 13:38:45 +0200

add supported_suites and default_suites. fill build_for using those

Diffstat:
M
build.py
 | 
15
+++++++++------
M
config.def.py
 | 
26
+++++++++++++++++++++++++-

2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/build.py b/build.py
@@ -10,8 +10,8 @@ from os import environ as env
 from os.path import basename
 import jenkins
 
-from config import (dryrun, jobtypes, suites, jenkins_host, jenkins_user,
-                    jenkins_pass)
+from config import (dryrun, jobtypes, default_suites, supported_suites,
+                    jenkins_host, jenkins_user, jenkins_pass)
 
 
 def main():
@@ -38,11 +38,14 @@ def main():
             print('%s does not exist in Jenkins! Quitting.' % jobname)
             sys.exit(1)
 
-    build_for = []  # looks unnecessary in releasebot (line 292)
-                    # perhaps we should just build everywhere we can?
-                    # discuss
+    build_for = list(set(sys.argv[1:]).intersection(supported_suites))
+    if not build_for:
+        print('Error: no valid suites found in arguments. Exiting.')
+        sys.exit(1)
+        # in original releasebot it defaults to the declared suites if
+        # no valid ones were passed
+        # build_for = suites
 
-    build_for = suites
     for build in build_for:
         print('- Building for %s' % build)
         if not dryrun:
diff --git a/config.def.py b/config.def.py
@@ -15,12 +15,28 @@ vcs_credentials = ''
 
 jobtypes = ['source', 'binaries', 'repos']
 
-suites = [
+default_suites = [
     'jessie',
     'ascii',
     'unstable',
 ]
 
+supported_suites = [
+    'experimental',
+
+    'unstable',
+
+    'jessie',
+    'jessie-backports',
+    'jessie-proposed-updates',
+    'jessie-updates',
+
+    'ascii',
+    'ascii-backports'
+    'ascii-proposed-updates',
+    'ascii-updates',
+]
+
 architectures = [
     'all'
     'amd64',
@@ -30,6 +46,14 @@ architectures = [
     'arm64',
 ]
 
+arches_any = [
+    'amd64',
+    'i386',
+    'armel',
+    'armhf',
+    'arm64',
+]
+
 arches_qemusys = [
     'armel_qemusys',
     'armhf_qemusys',