Fix various small issues left behind branch cut

Change-Id: If8dbe63ddc26f4ebcc08b5db2149e227a7f2c162
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index b0ba0ec7bc94107ddae6a0447426f20ff55ab4a4..bf69777980e7e3b32ddc393618a68a4f5ab02224 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -46,8 +46,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 9c4bc6e7da9aaa54545945c8cd21e3b0dfd5af8b..8ff295cd5c4847a520e47e9efe2f0e832220a989 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -1,6 +1,7 @@
 - project:
     name: neutron-daily-openstack
     jobs:
+        # TODO: Do we want boron job too?
         - 'neutron-daily-openstack-beryllium'
 
     project: 'neutron'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
similarity index 94%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 9d9002584a1b593afa3eb4a243339b0277a2bf2f..d311dc6f6d7432cd05180e71a53c5e88efec3952 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-beryllium
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index a7143aa77540bd3e78426597bb52c011be8af9f2..417049d3b4b505ffc2d7fc6dd50549ba2c1ab11b 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -69,7 +69,7 @@ if cfg.get("STREAMS"):  # this is a list of single-key dicts
     for stream_dict in cfg.get("STREAMS"):
         streams.update(stream_dict)
 else:
-    streams = {"beryllium": jjblib.STREAM_DEFAULTS["beryllium"]}
+    streams = {"boron": jjblib.STREAM_DEFAULTS["boron"]}
 
 first_stream = streams.iterkeys().next()  # Keep master branch at top.
 sonar_branch = streams[first_stream]["branch"]

diff --git a/scripts/jjblib.py b/scripts/jjblib.py
index 56e98d6aa56f100ac0827ed69b17d8722db249a6..50c5643702b4dec092f8b268d73cd58154d30964 100644 (file)
--- a/scripts/jjblib.py
+++ b/scripts/jjblib.py
@@ -32,7 +32,8 @@ def parse_jjb_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"}),
 ])