Add support for selecting JDKs in verify builds

Change-Id: I2e1e1874b90d5f6345fb1993793ef08b274816a4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 62fc2518248371d103401e8f2ac4ab25d1caabdc..4a3d12696b564c6f6f6858523c9a51b4b22485db 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -22,7 +22,7 @@
         - axis:
             type: jdk
             values:
-                - openjdk7
+JDKS
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'

diff --git a/scripts/jjb-autoupdate-project.py b/scripts/jjb-autoupdate-project.py
index 8e35661cc9fb8da6013cd9397b2256a7c151c1bc..65aa9c12b91f6db9c4ad9f28aa7423096233074b 100644 (file)
--- a/scripts/jjb-autoupdate-project.py
+++ b/scripts/jjb-autoupdate-project.py
@@ -47,6 +47,8 @@ def update_templates(projects):
                     parameters.append("-t '%s'" % v)
                 elif k == "BRANCHES" and v is not None:
                     parameters.append("-b '%s'" % v)
+                elif k == "JDKS" and v is not None:
+                    parameters.append("-j '%s'" % v)
                 elif k == "MVN_GOALS" and v is not None:
                     parameters.append("-g '%s'" % v)
                 elif k == "MVN_OPTS" and v is not None:

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 65d2754c935310257709a8ef676a8a671e82a8d5..1e00a2aff5a3002aed248f1a54959136eb183acd 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -29,6 +29,7 @@ parser.add_argument("-d", "--dependencies",
                           "Example: aaa,controller,yangtools"))
 parser.add_argument("-t", "--templates", help="Job templates to use")
 parser.add_argument("-b", "--branches", help="Git Branches to build")
+parser.add_argument("-j", "--jdks", help="JDKs to build against (for verify jobs)")  # noqa
 parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
 parser.add_argument("-o", "--mvn-opts", help="Maven Options")
 parser.add_argument("-a", "--archive-artifacts",
@@ -44,6 +45,7 @@ project_dir = os.path.join("jjb", project)
 project_file = os.path.join(project_dir, "%s.yaml" % project)
 templates = args.templates  # Defaults to all templates
 branches = args.branches    # Defaults to "master,stable/helium" if not passed
+jdks = args.jdks            # Defaults to openjdk7
 mvn_goals = args.mvn_goals  # Defaults to "clean install" if not passsed
 mvn_opts = args.mvn_opts    # Defaults to blank if not passed
 dependencies = args.dependencies
@@ -87,6 +89,15 @@ for branch in branches.split(","):
                          (branch.replace('/', '-'),
                           branch))
 
+if not jdks:
+    jdks = "openjdk7"
+else:
+    make_cfg = True
+    cfg_string.append("JDKS: %s" % jdks)
+use_jdks = ""
+for jdk in jdks.split(","):
+    use_jdks += "                - %s\n" % jdk
+
 if not mvn_goals:
     mvn_goals = ("clean install "
                  "-V "  # Show Maven / Java version before building
@@ -164,6 +175,7 @@ for t in use_templates:
     else:
         job_templates_yaml = job_templates_yaml + \
             "        - '%s-%s-{stream}'\n" % (project, t)
+
 with open(project_file, "w") as outfile:
     for t in use_templates:
         template_file = "jjb-templates/%s.yaml" % t
@@ -174,6 +186,7 @@ with open(project_file, "w") as outfile:
                     line = re.sub("PROJECT", project, line)
                     line = re.sub("DISABLED", disabled, line)
                     line = re.sub("STREAMS", streams, line)
+                    line = re.sub("JDKS", use_jdks, line)
                     line = re.sub("MAVEN_GOALS", mvn_goals, line)
                     line = re.sub("MAVEN_OPTS", mvn_opts, line)
                     line = re.sub("DEPENDENCIES", dependent_jobs, line)