Merge "Revert "Exclude release notes job for ar beryllium""

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index ba63cef0b2b21476d69c46ac808f750f0ae5f755..8778cf5f32e30e5075bd4b4f0741f48023126f3b 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -40,7 +40,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Robot custom options

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index dcb89b3501c50e77b4e08ba1eae9f4cb0397b57b..40dc8c32ef55aef1f6e9e39cd86bc56bf32fd1a0 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 599c29b3a13715db0abe1ba7da78cec4734dd198..cc5101f4aefb6fb33981ee768adf333474c2d1e4 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 76edf60104e8d455797918f476a94cdaefd8e439..4c1b0afd0914a23ea6d12e4a80112d3fec1c18f3 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index 6956ceb2c038efc6f7c63eb1108a1216cd0d4c9d..bd0bbc154aed6a7df0fe8fe34c62a9dad300aaf1 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 5a131a293ec30756818c5a88a7c04860e0a36cda..039c68410bf1d8ff5fc0bdec9a72df97d6d097f0 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index b20f1ad570c7203a58a3c14d0f100a1af4f38860..7e7ff6791eb1fb429fcaec25d9c846ac6accb7b5 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -238,11 +238,6 @@ done
 echo "Cool down for ${COOLDOWN_PERIOD} seconds :)..."
 sleep ${COOLDOWN_PERIOD}
 
-if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
-   echo "Exiting without running tests to deploy openstack for testing"
-   exit
-fi
-
 echo "Generating controller variables..."
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
@@ -253,6 +248,11 @@ do
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
+if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
+   echo "Exiting without running tests to deploy openstack for testing"
+   exit
+fi
+
 echo "Generating mininet variables..."
 for i in `seq 1 ${NUM_TOOLS_SYSTEM}`
 do

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 c3e110fd5d5fdb15f559cfc5b68c339238723b61..d22ccf13064d67f9c96b3564ce16d4f636f79150 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -370,6 +370,9 @@ set +e  # We do not want to create red dot just because something went wrong whi
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
+    echo "Lets's take the karaf thread dump again..."
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "killing karaf process..."
     ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 6ad635cdc16fa34f68c65a7e6249d5b4581f1399..be6b965f39f1448609f9f426df605be26cfa5a94 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -52,6 +52,9 @@ pip install --upgrade tornado jsonpointer
 # Module for TemplatedRequests.robot library
 pip install --upgrade jmespath
 
+# Module for backup-restore support library
+pip install jsonpatch
+
 # Print installed versions.
 pip freeze
 

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index b69daa0f9c7910c6f3da97d6d04d1c720ef74ae5..63ae08f99415b645c8cd981bf2c3a6410a4897cf 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -34,8 +34,7 @@
       - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # TODO uncomment this line when IoTDM added to Carbon
-      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 497d2d42b9d3c3c9c03ce0a11dc245c0a9ce80e6..99c83f650dc79ad00d708c011a5b4f59956b0a76 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -59,8 +59,6 @@
 
     tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
 
-    odl_system_image: 'CentOS 7 - java-builder - 20170403-0948'
-
     enable-networking-l2gw: 'yes'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f45a61a8be9389c5b63eea48f7460e60be162363..7fe94b94292015b18d36a1ca91d3c30afecbfed3 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -120,6 +120,14 @@
       - opendaylight-infra-properties:
           build-days-to-keep: 7
 
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 55efc9970af866df8349ada2af99617be6302fb1..5f392cf8a15c69c97839144fa0edd6bb26d0e19b 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -47,15 +47,3 @@ apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
-
-#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
-echo "---> Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/