Merge "Switch to build-discarder property for logrotate"

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 2f87fdfdd2cc4cb7c735b4ac650f58000d209993..075fe84fa69b77bf3c40892c7b1bbb285a6c45bd 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -446,7 +446,7 @@
             !include-raw:
                 - include-raw-integration-multipatch-distribution-test.sh
 
-# Macro: integration-cleanup-worspace
+# Macro: integration-cleanup-workspace
 # Operation: Cleans up files possibly left there by the previous build
 # Used by: {project}-csit-* job templates
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 2d94b95c10d8f349de603934ba48bef8b774b8cf..18eaaf7d91f48ac2a16dd26fc5d91db326911d4d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -198,6 +198,8 @@
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
+        # when upgrading to carbon you should replace odl-netconf-connector-all with odl-netconf-topology from
+        # controller-features and change USE_NETCONF_CONNECTOR to False in test-options
         - integration-branch:
             branch: 'stable/boron'
         - integration-distribution-stream:
@@ -215,7 +217,7 @@
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-v TIMEOUT_BUG_4220:10s'
+            test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True'
         - integration-stream-test-plan:
             stream-test-plan: 'test-libraries-boron.txt'
         - integration-test-plan:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index dbfba1dbb6850ad686664d852db37474b1f960c9..649454fc401e2fce33cabebcfa6471171772c35f 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -17,9 +17,13 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+            install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all,odl-netconf-topology'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
+            install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all,odl-netconf-topology'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
         - only:
@@ -28,10 +32,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all,odl-netconf-topology'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-topology'
 
     # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:True'
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # This scaling test can take several hours to finish,
     # so the job is defined to run once a day.