Merge "Re-enable validate-autorelease job for capwap"

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/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index 1f7a0d7ff0344c8b151f2a4e8b12907a0c72f9fe..b0c3a1d7785d1d5048c34d2248dee4117b4c900e 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -2,7 +2,7 @@ DEPENDENCIES: yangtools,aaa,controller,odlparent
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 5dfc5ac62c4d384dc0e3c5606d03c789e5df5ca3..ccff81660d3af9b80ed71a9ffd79f030bf704f3f 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
new file mode 100644 (file)
index 0000000..7e04d57
--- /dev/null
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: netconf-csit-clustering
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'netconf'
+
+    # The functionality under test
+    functionality: 'clustering'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-netconf-clustered-topology'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'

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/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index 98da554a410afa0ef92953dff905e08f3ccc7a1e..7bbe20d44bcb4632a8bff1b4cc87ec8fb9a370c8 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index f88a242747f385f8b8519e9c753de9df359034f5..71679495325552d5c955e07b26781042c21ccb1e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:

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/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index d13c48fb2159ef5e6d873856d09dd9305d7e70ec..c26bfb3c0aac9f7d9e398c5f1d834b13112ea998 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 0d44413302126ae1cd6e54c9bc6896deb51d88b7..c5b72a031d7a920f8a8fac1a095008d2d2bc1c3a 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -20,9 +20,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:

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"}),
 ])