X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fjjblib.py;h=f48ab916699a2b7c0f523213874bf22b292b8ae5;hb=245d7e2c5cced0f71ccd9a07b18d2cf95326a9f0;hp=f5980929ba911210d9d1323eb0a4ba07a49fcce7;hpb=1e9d7d1602a1e883cb7ec3e58be46a40496d4b21;p=releng%2Fbuilder.git diff --git a/scripts/jjblib.py b/scripts/jjblib.py index f5980929b..f48ab9166 100644 --- a/scripts/jjblib.py +++ b/scripts/jjblib.py @@ -28,17 +28,13 @@ def parse_jjb_args(): 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("-r", "--autorelease", action="store_true", - help="Enable the validate-autorelease job, you " - "should enable this if your project is part of " - "the simultanious release.") return parser.parse_args() STREAM_DEFAULTS = collections.OrderedDict([ - ("beryllium", {"branch": "master", "jdks": "openjdk8"}), + ("boron", {"branch": "master", "jdks": "openjdk8"}), + ("beryllium", {"branch": "stable/beryllium", "jdks": "openjdk8"}), ("stable-lithium", {"branch": "stable/lithium", "jdks": "openjdk7"}), - ("stable-helium", {"branch": "stable/helium", "jdks": "openjdk7"}), ]) @@ -69,9 +65,6 @@ def create_template_config(project_dir, args): if args.archive_artifacts: cfg_data["ARCHIVE"] = args.archive_artifacts - if args.autorelease: - cfg_data["AUTORELEASE"] = args.autorelease - if cfg_data: # Create project directory if it doesn't exist if not os.path.exists(project_dir):