Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert rtd merge job into a global template
[releng/builder.git]
/
scripts
/
jjblib.py
diff --git
a/scripts/jjblib.py
b/scripts/jjblib.py
index 2eea9bd784f5ba5a1decbc3b6659aee491e00e05..f48ab916699a2b7c0f523213874bf22b292b8ae5 100644
(file)
--- a/
scripts/jjblib.py
+++ b/
scripts/jjblib.py
@@
-1,4
+1,5
@@
import argparse
import argparse
+import collections
import os
import yaml
import os
import yaml
@@
-17,7
+18,8
@@
def parse_jjb_args():
"job is built successfully.\n\n"
"Example: aaa,controller,yangtools"))
parser.add_argument("-t", "--templates", help="Job templates to use")
"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("-s", "--streams",
+ help="Release streams to fill with default options")
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("-p", "--pom", help="Path to pom.xml to use in Maven "
"build (Default: pom.xml")
parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
@@
-29,17
+31,24
@@
def parse_jjb_args():
return parser.parse_args()
return parser.parse_args()
+STREAM_DEFAULTS = collections.OrderedDict([
+ ("boron", {"branch": "master", "jdks": "openjdk8"}),
+ ("beryllium", {"branch": "stable/beryllium", "jdks": "openjdk8"}),
+ ("stable-lithium", {"branch": "stable/lithium", "jdks": "openjdk7"}),
+])
+
+
def create_template_config(project_dir, args):
cfg_data = dict()
if args.templates:
cfg_data["JOB_TEMPLATES"] = args.templates
def create_template_config(project_dir, args):
cfg_data = dict()
if args.templates:
cfg_data["JOB_TEMPLATES"] = args.templates
- if args.
branche
s:
-
branch
_list = list()
- for
branch in args.branche
s.split(","):
-
branch_list.append({branch: {"jdks": "openjdk7"}
})
- cfg_data["
BRANCHES"] = branch
_list
+ if args.
stream
s:
+
stream
_list = list()
+ for
stream in args.stream
s.split(","):
+
stream_list.append({stream: STREAM_DEFAULTS[stream]
})
+ cfg_data["
STREAMS"] = stream
_list
if args.pom:
cfg_data["POM"] = args.pom
if args.pom:
cfg_data["POM"] = args.pom
@@
-69,7
+78,16
@@
def create_template_config(project_dir, args):
class Project:
class Project:
+ """Represents a Gerrit Project
+
+ Attributes:
+ path(str): The full Gerrit path to a project
+ meta_project(str): The top-level project name in Gerrit
+ project(str): The subproject name or project shortname
+ """
+
def __init__(self, project):
def __init__(self, project):
+ self.path = project
self.meta_project = None
self.project = project
self.meta_project = None
self.project = project