Merge "Update common-packer to latest master"

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
index 12c0534fbd463fe7f1152209cf54a5c4b71caae7..c3eab9e1eafbffdadf437f4eb7eda992b9ffa103 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 HARDWARE_ID=odl-standard-1

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 9afe09314192da169c3fb1968aec9476ec5d0768..fc0c7a97b0ddc833ba460e01d4021dc38368d09b 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -30,4 +30,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514

diff --git a/jjb/autorelease/update-validate-autorelease-projects.sh b/jjb/autorelease/update-validate-autorelease-projects.sh
index 5bc1901a4e8dc3872ae71cd6e033e08d77ad22f8..a6663752f38ef21ee239d4ca7ab7f146e7e84a14 100644 (file)
--- a/jjb/autorelease/update-validate-autorelease-projects.sh
+++ b/jjb/autorelease/update-validate-autorelease-projects.sh
@@ -38,11 +38,6 @@ cat > "$YAML_FILE" << EOF
 EOF
 
 for module in "${modules[@]}"; do
-    # TODO: Remove this once mdsal fully becomes an MRI project.
-    if [ "$module" == "mdsal" ] && [ "$BRANCH" == "master" ]; then
-        continue
-    fi
-
     echo "Include $module"
     echo "      - ${module//\//-}:" >> "$YAML_FILE"
     echo "          project: $module" >> "$YAML_FILE"

diff --git a/jjb/autorelease/view-autorelease-neon.yaml b/jjb/autorelease/view-autorelease-neon.yaml
index 20b90f0c93ef00ac8e6df35e03a6600242cf7432..98e800a2dbb32448f9deb3cedefff18d9351d743 100644 (file)
--- a/jjb/autorelease/view-autorelease-neon.yaml
+++ b/jjb/autorelease/view-autorelease-neon.yaml
@@ -31,7 +31,6 @@
       - 'infrautils-maven-merge-neon'
       - 'integration/distribution-maven-merge-neon'
       - 'lispflowmapping-maven-merge-neon'
-      - 'mdsal-maven-merge-neon'
       - 'netconf-maven-merge-neon'
       - 'netvirt-maven-merge-neon'
       - 'neutron-maven-merge-neon'

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d3947cbe6a105c2ff80cf2269777ca113f3f7e15..9caf0f50a848c42eec7d39108c8fbfca82926323 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -106,7 +106,7 @@
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
     tools_system_count: 1
     tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index b83a89480b8548bedb265875ab22bd0d4d8c23ce..1cc1b232f97b2d4af776b5204c16339de3b74256 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -24,7 +24,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Features to install
     install-features: 'odl-lacp-ui'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index 1c7036ce461347191aa2c77c3de72b2e0dcee28f..4cda23afcd78b588732113a154b87782828f10b5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -23,7 +23,7 @@
 
     # Job images
     tools_system_count: 2
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 9b400522616648edc1594423c51e607d4c912dad..27540e73ccef4d1eeae307fec6d004e4cc426aa8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 70e26fbe739532e1dcc62945adaa5a579502ef72..04b07adb1f677b61f1fb9f872ff15c45ad8ae55b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 5d294a6d956ad752bfcf759d43fce56d78a61e48..ff8ba430f00d2baba6bca5e6c21174be694e7b79 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 0f3bba85ee06287d33d049bc14e147f6333345cd..9bbc4cf698cde000b6576fff60d2b5b33b52ba10 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index fe51f8766638caf4c4632a0be4fa7f618dc055e2..36c42a25308ce6be16775c7450add4a55d9a1f1d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -26,7 +26,7 @@
           scope: 'all'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 0f0ac4c1f8869b9d535d063adc51a72c14399f30..ca0d53dbe07e80754405eec5f0e5715112493002 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -25,7 +25,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 98f5e083ef81e8224903a6a617531a6b26ee56d1..540f34830855505b7f2c7b53fa7566651026a7a7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 6c60ea5c1e14b6a178cf81095e725797e16fdcdf..1232f7ff9dbb45834d8fc0122dcd2baecb76dff0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 85045f4d501d18c00a23273a72ab548c6d917efc..aa2a4db56aa826284460afec764323678b4b6920 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -25,7 +25,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 104c06f663b57b5b1939567801225ad6f7d933d1..f5287d8b9cd3ce36d370f7c4e5aa6c61177f8554 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 1b3b189a5d6dba96f309a2072b9b242c1cf1082c..7bd8ad239e5e831f3f376f9f3236e951f6b7d22b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index f00e38cec6c0d2fca8956972e08cb74591895ece..7d0a84343612501424320651bb236e3204ec3414 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180723-235605.507'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
 
     # Features to install
     install-features: >