import os
-import yaml
-
def get_autoupdate_projects(jjb_dir, projects):
"""Get list of projects that should be auto-updated."""
def update_templates(projects):
for project in projects:
-
- # If project has customized variables
cfg_file = "jjb/%s/%s.cfg" % (project, project)
- parameters = ["python scripts/jjb-init-project.py"]
- parameters.append("-z") # Disable CFG auto-generation
- if os.path.isfile(cfg_file):
- stream = open(cfg_file, "r")
- cfg = yaml.load(stream)
- for k, v in cfg.items():
- if k == "JOB_TEMPLATES" and v is not None:
- 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 == "POM" and v is not None:
- parameters.append("-p '%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:
- parameters.append("-o '%s'" % v)
- elif k == "DEPENDENCIES" and v is not None:
- parameters.append("-d '%s'" % v)
- elif k == "ARCHIVE_ARTIFACTS" and v is not None:
- parameters.append("-a '%s'" % v)
-
- parameters.append(project)
- cmd = " ".join(parameters)
- os.system(cmd)
-
- else:
- os.system("python scripts/jjb-init-project.py -z %s" % project)
+ os.system("python scripts/jjb-init-project.py %s -c %s" %
+ (project, cfg_file))
##############
# Code Start #
# Thanh Ha (The Linux Foundation) - Initial implementation
##############################################################################
-import argparse
import os
import re
-parser = argparse.ArgumentParser()
-parser.add_argument("project", help="project")
-parser.add_argument("-d", "--dependencies",
- help=("Project dependencies\n\n"
- "A comma-seperated (no spaces) list of projects "
- "your project depends on. "
- "This is used to create an integration job that "
- "will trigger when a dependent project-merge job "
- "is built successfully.\n\n"
- "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("-p", "--pom", help="Path to pom.xml to use in Maven build"
- "(Default: pom.xml")
-parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
-parser.add_argument("-o", "--mvn-opts", help="Maven Options")
-parser.add_argument("-a", "--archive-artifacts",
- help="Comma-seperated list of patterns of artifacts to "
- "archive on build completion. "
- "See: http://ant.apache.org/manual/Types/fileset.html") # noqa
-parser.add_argument("-z", "--no-cfg", action="store_true",
- help=("Disable initializing the project.cfg file."))
-args = parser.parse_args()
+import yaml
+
+import jjblib
+
+
+args = jjblib.parse_jjb_args()
project = args.project
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
-pom = args.pom # Defaults to pom.xml
-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
dependent_jobs = ""
disabled = "true" # Always disabled unless project has dependencies
email_prefix = "[%s]" % project
-archive_artifacts = args.archive_artifacts
-# The below 2 variables are used to determine if we should generate a CFG file
-# for a project automatically.
-#
-# no_cfg - is a commandline parameter that can be used by scripts such as the
-# jjb-autoupdate-project script to explicitly disable generating CFG
-# files.
-# make_cfg - is a internal variable used to decide if we should try to
-# auto generate the CFG file for a project based on optional
-# variables passed by the user on the commandline.
-no_cfg = args.no_cfg
-make_cfg = False # Set to true if we need to generate initial CFG file
-cfg_string = []
-
-if not templates:
- templates = "verify,merge,daily,integration,sonar"
+if not args.conf:
+ jjblib.create_template_config(project_dir, args)
+ project_conf = os.path.join(project_dir, "%s.cfg" % args.project)
+else:
+ project_conf = args.conf
+
+cfg = dict() # Needed to skip missing project.cfg files
+if os.path.isfile(project_conf):
+ stream = open(project_conf, "r")
+ cfg = yaml.load(stream)
+
+####################
+# Handle Templates #
+####################
+if cfg.get('JOB_TEMPLATES'):
+ templates = cfg.get('JOB_TEMPLATES')
else:
- make_cfg = True
- cfg_string.append("JOB_TEMPLATES: %s" % templates)
+ templates = "verify,merge,daily,integration,sonar"
templates += ",clm" # ensure we always create a clm job for all projects
-if not branches:
- branches = "master,stable/helium"
- sonar_branch = "master"
-else:
- make_cfg = True
- cfg_string.append("BRANCHES: %s" % branches)
- # For projects who use a different development branch than master
+###################
+# Handle Branches #
+###################
+if cfg.get('BRANCHES'):
+ branches = cfg.get('BRANCHES')
sonar_branch = branches.split(",")[0]
+else:
+ branches = "master,stable/helium"
+ sonar_branch = 'master'
# Create YAML to list branches to create jobs for
streams = "stream:\n"
for branch in branches.split(","):
(branch.replace('/', '-'),
branch))
-if not jdks:
- jdks = "openjdk7"
+###############
+# Handle JDKS #
+###############
+if cfg.get('JDKS'):
+ jdks = cfg.get('JDKS')
else:
- make_cfg = True
- cfg_string.append("JDKS: %s" % jdks)
+ jdks = "openjdk7"
use_jdks = ""
for jdk in jdks.split(","):
use_jdks += " - %s\n" % jdk
-if not pom:
- pom = "pom.xml"
+##############
+# Handle POM #
+##############
+if cfg.get('POM'):
+ pom = cfg.get('POM')
else:
- make_cfg = True
- cfg_string.append("POM: %s" % pom)
+ pom = "pom.xml"
-if not mvn_goals:
+####################
+# Handle MVN_GOALS #
+####################
+if cfg.get('MVN_GOALS'):
+ mvn_goals = cfg.get('MVN_GOALS')
+else:
mvn_goals = ("clean install "
"-V " # Show Maven / Java version before building
"-Dmaven.repo.local=/tmp/r "
"-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r ")
-else: # User explicitly set MAVEN_OPTS so create CFG
- make_cfg = True
- cfg_string.append("MAVEN_GOALS: %s" % mvn_goals)
-if not mvn_opts:
+###################
+# Handle MVN_OPTS #
+###################
+if cfg.get('MVN_OPTS'):
+ mvn_opts = cfg.get('MVN_OPTS')
+else:
mvn_opts = "-Xmx1024m -XX:MaxPermSize=256m"
-else: # User explicitly set MAVEN_OPTS so create CFG
- make_cfg = True
- cfg_string.append("MAVEN_OPTS: %s" % mvn_opts)
-if not dependencies:
- dependencies = "odlparent" # All projects depend on odlparent
-if dependencies:
- if dependencies.find("odlparent") < 0: # If odlparent is not listed add it
+#######################
+# Handle DEPENDENCIES #
+#######################
+if cfg.get('DEPENDENCIES'):
+ dependencies = cfg.get('DEPENDENCIES')
+ if dependencies.find("odlparent") < 0: # Add odlparent if not listed
dependencies = "odlparent," + dependencies
- make_cfg = True
disabled = "false"
- email_prefix = (email_prefix + " " +
- " ".join(['[%s]' % d for d in dependencies.split(",")]))
- dependent_jobs = ",".join(
- ['%s-merge-{stream}' % d for d in dependencies.split(",")])
- cfg_string.append("DEPENDENCIES: %s" % dependencies)
-
-if not archive_artifacts:
- archive_artifacts = ""
else:
- cfg_string.append("ARCHIVE: %s" % archive_artifacts)
+ dependencies = "odlparent" # All projects depend on odlparent
+ disabled = "false"
+
+email_prefix = (email_prefix + " " +
+ " ".join(['[%s]' % d for d in dependencies.split(",")])) # noqa
+dependent_jobs = ",".join(
+ ['%s-merge-{stream}' % d for d in dependencies.split(",")])
+
+############################
+# Handle ARCHIVE_ARTIFACTS #
+############################
+if cfg.get('ARCHIVE_ARTIFACTS'):
+ archive_artifacts = cfg.get('ARCHIVE_ARTIFACTS')
archive_artifacts = ("- archive-artifacts:\n"
" artifacts: '%s'" % archive_artifacts)
+else:
+ archive_artifacts = ""
+
##############################
# Create configuration start #
dependencies,
archive_artifacts,))
-# Create initial project CFG file
-if not no_cfg and make_cfg:
- print("Creating %s.cfg file" % project)
- cfg_file = os.path.join(project_dir, "%s.cfg" % project)
- with open(cfg_file, "w") as outstream:
- cfg = "\n".join(cfg_string)
- outstream.write(cfg)
-
# Create initial project YAML file
use_templates = templates.split(",")
use_templates.insert(0, "project")
--- /dev/null
+import argparse
+import os
+
+import yaml
+
+
+def parse_jjb_args():
+ parser = argparse.ArgumentParser()
+ parser.add_argument("project", help="project")
+ parser.add_argument("-c", "--conf", help="Config file")
+ parser.add_argument("-d", "--dependencies",
+ help=("Project dependencies\n\n"
+ "A comma-seperated (no spaces) list of projects "
+ "your project depends on. "
+ "This is used to create an integration job that "
+ "will trigger when a dependent project-merge "
+ "job is built successfully.\n\n"
+ "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("-p", "--pom", help="Path to pom.xml to use in Maven "
+ "build (Default: pom.xml")
+ parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
+ parser.add_argument("-o", "--mvn-opts", help="Maven Options")
+ parser.add_argument("-a", "--archive-artifacts",
+ help="Comma-seperated list of patterns of artifacts "
+ "to archive on build completion. "
+ "See: http://ant.apache.org/manual/Types/fileset.html") # noqa
+ return parser.parse_args()
+
+
+def create_template_config(project_dir, args):
+ cfg_data = dict()
+
+ if args.templates:
+ cfg_data["JOB_TEMPLATES"] = args.templates
+ if args.branches:
+ cfg_data["BRANCHES"] = args.branches
+ if args.jdks:
+ cfg_data["JDKS"] = args.jdks
+ if args.pom:
+ cfg_data["POM"] = args.pom
+ if args.mvn_goals:
+ cfg_data["MAVEN_GOALS"] = args.mvn_goals
+ if args.mvn_opts:
+ cfg_data["MAVEN_OPTS"] = args.mvn_opts
+ if args.dependencies:
+ cfg_data["DEPENDENCIES"] = args.dependencies
+ if args.archive_artifacts:
+ cfg_data["ARCHIVE"] = args.archive_artifacts
+
+ if cfg_data:
+ # Create project directory if it doesn't exist
+ if not os.path.exists(project_dir):
+ os.makedirs(project_dir)
+
+ print("Creating %s.cfg file" % args.project)
+ cfg_file = os.path.join(project_dir, "%s.cfg" % args.project)
+
+ with open(cfg_file, "w") as outstream:
+ outstream.write(yaml.dump(cfg_data, default_flow_style=False))
Code Review / releng / builder.git / commitdiff