Merge "Add controller's rpc partition and heal 24h job"

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 641e129cdcf3bd2515e644287d94dc39cdb6c0c1..3182bdcdc44dde21a414bdc957bfe1ad3e4a6813 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -409,6 +409,7 @@ do
     scp extra_debug.sh ${!OS_CTRL_IP}:/tmp
     ${SSH} ${!OS_CTRL_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
     scp ${!OS_CTRL_IP}:/tmp/extra_debug.log ${OS_CTRL_FOLDER}/extra_debug.log
+    scp ${!OS_CTRL_IP}:/tmp/*.xz ${OS_CTRL_FOLDER}/
     mv local.conf_control_${!OS_CTRL_IP} ${OS_CTRL_FOLDER}/local.conf
     mv ${OS_CTRL_FOLDER} ${WORKSPACE}/archives/
 done
@@ -426,6 +427,7 @@ do
     scp extra_debug.sh ${!OSIP}:/tmp
     ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
     scp ${!OSIP}:/tmp/extra_debug.log ${OS_COMPUTE_FOLDER}/extra_debug.log
+    scp ${!OSIP}:/tmp/*.xz ${OS_COMPUTE_FOLDER}/
     mv local.conf_compute_${!OSIP} ${OS_COMPUTE_FOLDER}/local.conf
     mv ${OS_COMPUTE_FOLDER} ${WORKSPACE}/archives/
 done
@@ -709,14 +711,35 @@ do
     fi
 
     # Control Node - PUBLIC_BRIDGE will act as the external router
-    GATEWAY_IP="10.10.10.250" # FIXME this should be a parameter, also shared with integration-test
-    GATEWAY_VLAN_ID=167
+    # Parameter values below are used in integration/test - changing them requires updates in intergration/test as well
+    EXTNET_GATEWAY_IP="10.10.10.250"
+    EXTNET_VLAN_ID=167
+    EXTNET_INTERNET_IP="10.9.9.9"
+    EXTNET_PNF_IP="10.10.10.253"
     if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
-        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${GATEWAY_IP}/24"
+        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${EXTNET_GATEWAY_IP}/24"
     else
-        ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} type vlan id ${GATEWAY_VLAN_ID}"
+        ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID}"
         ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up"
-        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} up ${GATEWAY_IP}/24"
+        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} up ${EXTNET_GATEWAY_IP}/24"
+
+        # Control Node - external net PNF simulation
+        ${SSH} ${!CONTROLIP} "
+            sudo ip netns add pnf_ns;
+            sudo ip link add pnf_veth0 type veth peer name pnf_veth1;
+            sudo ip link set pnf_veth1 netns pnf_ns;
+            sudo ip link set pnf_veth0 up;
+            sudo ip netns exec pnf_ns ifconfig pnf_veth1 up;
+            sudo ip netns exec pnf_ns ip link add link pnf_veth1 name pnf_veth1.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID};
+            sudo ip netns exec pnf_ns ifconfig pnf_veth1.${EXTNET_VLAN_ID} up ${EXTNET_PNF_IP}/24;
+            sudo ovs-vsctl add-port br-physnet1 pnf_veth0;
+        "
+
+        # Control Node - external net internet address simulation
+        ${SSH} ${!CONTROLIP} "
+            sudo ip tuntap add dev internet_tap mode tap;
+            sudo ifconfig internet_tap up ${EXTNET_INTERNET_IP}/24;
+        "
     fi
 
     # Computes

diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
index 81fb82606564e83d2654b40bb4011eb62ab547a6..89acb6be8dc09012155b7b26482ae765603de860 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
@@ -13,9 +13,6 @@
 
     # Project branches
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index fdfcba380531d780d886ee9ef551881e866ae1d3..55fa716e8c38d1cb12528410934f5597fb925f48 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -29,9 +29,6 @@
           schedule: ''
 
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
index 45df5bbfb8521580753f50c2d3ce7c279e93c9a8..3d36c38ef43f301af39b2b5f7680d6e08879ba7e 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit.yaml
@@ -13,9 +13,6 @@
 
     # Project branches
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 09cbad2a1344e27f7174a89866fbefc5ffca2d4f..8888aa50f6b4f27d146a867ee275cb7eb9e0ba57 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -292,15 +292,6 @@
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
-        netvirt-legacy-csit-1node-openstack-basic-all-carbon,
-        netvirt-legacy-csit-1node-openstack-basic-only-carbon,
-        netvirt-legacy-csit-1node-openstack-mitaka-upstream-carbon,
-        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-carbon,
-        netvirt-legacy-csit-1node-openstack-newton-upstream-carbon,
-        netvirt-legacy-csit-3node-clustering-only-carbon,
-        netvirt-legacy-csit-3node-openstack-mitaka-upstream-carbon,
-        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-carbon,
-        netvirt-legacy-csit-3node-openstack-newton-upstream-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
         nic-csit-1node-vtnrenderer-all-carbon,

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index cc23be0219e43d6e2451f63c5aef9bade1e4d71d..c6af80ec2fde9d7385bfcf1002e1a2360ea4a4c2 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -275,7 +275,7 @@
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
       maven-name: 'mvn33'
-      goals: |
+      goals: >
           {mvn-goals}
           -Dmerge
           -Dstream={stream}