Add csit test for tcp feature in usc

[releng/builder.git] / scripts / jjblib.py

diff --git a/scripts/jjblib.py b/scripts/jjblib.py
index f5980929ba911210d9d1323eb0a4ba07a49fcce7..50c5643702b4dec092f8b268d73cd58154d30964 100644 (file)
--- a/scripts/jjblib.py
+++ b/scripts/jjblib.py
@@ -28,15 +28,12 @@ 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 +66,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):