Merge "Auto Update CSIT Jobs to run for neon"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 3afbee1be73122b5b6365b92d8a4cd250b46a0bd..e69dc146a0490c068f5874fb6a9d7daacc1e137f 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -4,6 +4,7 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - builder - 20180201-2139
 * ZZCI - CentOS 7 - builder - 20180611-1830
 * ZZCI - CentOS 7 - builder - 20180723-235310.638
+* ZZCI - CentOS 7 - builder - 20180802-220823.782
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack - 20180723-235345.727
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649

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

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 98dd8fafbb2ebe75c8b579170c765b3a1639ab47..416058edc6794fde7096a0d8ff69117e58ce4deb 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -28,6 +28,7 @@
     tools_system_count: 3
 
     install-features: 'odl-genius-rest'
+    robot-options: '-v FAIL_ON_EXCEPTIONS:False'
 
 - project:
     name: genius-csit-genius-verify

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index ab62ce905be78f5aa0d83d13a47c2e3696146095..accea4a0b921dcb62ee82694cd43fdebfe4c2820 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -265,7 +265,7 @@ EOF
             ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_LBAAS_PLUGIN_ENABLED="yes"
         elif [ "$plugin_name" == "networking-sfc" ]; then
-            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_SFC_PLUGIN_ENABLED="yes"
         else
             echo "Error: Invalid plugin $plugin_name, unsupported"

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 84cdd3ebc694a0326208cf5caed2ea4f04823f9d..3a7fa59e597388a54a40aec41494d5f7dc7684c2 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -37,6 +37,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
+          distribution_branch: master
       - '{project-name}-maven-javadoc-jobs':
           mvn-version: 'mvn33'
       - '{project-name}-rtd-jobs':