Merge "Enable aggregate sonar reports for netconf"

diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml
index 2acda6eb014512dd691e81b8d153e0ea9b7b0e37..f7d21c7adaab4a5039bd9dc288d758f6c35182e7 100644 (file)
--- a/jjb/coe/coe-csit.yaml
+++ b/jjb/coe/coe-csit.yaml
@@ -5,9 +5,10 @@
       - inttest-csit-1node
 
     project: 'coe'
-    functionality: 'container-networking'
-
     install-features: 'odl-netvirt-coe'
+    testplan: '{project}-container-networking.txt'
+    tools_system_count: 5
+    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
 
     stream:
       - neon:
@@ -18,8 +19,9 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
-    tools_system_count: 5
-    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
+    functionality:
+      - 'gate-container-networking'
+      - 'container-networking'

diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml
index e79ddf59b82ac8d2000d6d40c380cc0ef085b2b2..c22ec726c7f9175cb68356f2fcabd37ebd97658b 100644 (file)
--- a/jjb/coe/coe-patch-test.yaml
+++ b/jjb/coe/coe-patch-test.yaml
@@ -19,4 +19,4 @@
     feature:
       - coe:
           csit-list: >
-              coe-csit-1node-container-networking-all-{stream}
+              coe-csit-1node-gate-container-networking-only-{stream}

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index a34dbe92ea76d1d0a3ea9fbbc56f22f0f96c0438..7b7d128fbd83861be7d8dbca51fe3f84b897580a 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -152,6 +152,7 @@ for suite in ${SUITES}; do
     -v RESTCONFPORT:8081 \
     -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \
     -v SSH_KEY:robot_id_rsa \
+    -v TOOLS_SYSTEM_IP: \
     -v USER_HOME:${HOME} \
     -v WORKSPACE:/tmp \
     ${TESTOPTIONS} ${suite} || true

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index c2d94f7246212005db405a3d5f81de02c57e98dc..3cac8e115eb0871e537ac5c4f55d2a4c726aea7d 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -54,6 +54,8 @@ pybot -N ${TESTPLAN} \
       -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
       -v CONTROLLER:${ODL_SYSTEM_IP} \
       -v CONTROLLER_USER:${USER} \
+      -v GERRIT_BRANCH:${GERRIT_BRANCH} \
+      -v GERRIT_REFSPEC:${GERRIT_REFSPEC} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
       -v JENKINS_WORKSPACE:${WORKSPACE} \

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 3ae1fb43d05185191b6902f47906aba30bdd75a6..40475f69a85b6de2c82b215a08cc4141ff4d6710 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -584,7 +584,7 @@
     job-name:
       - aaa-csit-1node-authn-all-fluorine
       - bgpcep-csit-1node-throughpcep-all-fluorine
-      - coe-csit-1node-container-networking-all-fluorine
+      - coe-csit-1node-container-networking-only-fluorine
       - controller-csit-1node-akka1-all-fluorine
       - controller-csit-1node-benchmark-all-fluorine
       - controller-csit-1node-notifications-longevity-only-fluorine
@@ -624,7 +624,7 @@
     job-name:
       - aaa-csit-1node-authn-all-neon
       - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-all-neon
+      - coe-csit-1node-container-networking-only-neon
       - controller-csit-1node-akka1-all-neon
       - controller-csit-1node-benchmark-all-neon
       - controller-csit-1node-notifications-longevity-only-neon

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index a4cc536712423a390c9f06f01caf8f611e338a8d..1827b80726242b112e1c9cab4a6545bc55eab102 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -43,7 +43,7 @@
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
       - coe:
           csit-list: >
-              coe-csit-1node-container-networking-all-{stream}
+              coe-csit-1node-gate-container-networking-only-{stream}
       - itm-direct-tunnels:
           csit-list: >
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}