Merge "Exclude release notes job for ar beryllium"

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/