Merge "VPP: added 1804 to arm verify stream and arm merge"

diff --git a/jjb/csit/include-raw-csit-dmm-functional-virl.sh b/jjb/csit/include-raw-csit-dmm-functional-virl.sh
new file mode 100644 (file)
index 0000000..f2bef39
--- /dev/null
+++ b/jjb/csit/include-raw-csit-dmm-functional-virl.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Copyright (c) 2018 Huawei Technologies Co.,Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -xeu -o pipefail
+
+# execute DMM bootstrap script if it exists
+if [ -e bootstrap-DMM.sh ]
+then
+    # make sure that bootstrap-DMM.sh is executable
+    chmod +x bootstrap-DMM.sh
+    # run the script
+    ./bootstrap-DMM.sh
+else
+    echo 'ERROR: No bootstrap-DMM.sh found'
+    exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
\ No newline at end of file

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index e5d4c45..95dd949 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -168,7 +168,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-arm-verify-{stream}-{os}'
@@ -413,7 +413,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
@@ -477,7 +477,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 2
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-verify-{stream}-clang'
@@ -531,7 +531,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-verify-os-{stream}-{os}'
@@ -684,7 +684,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-merge-os-{stream}-{os}'
@@ -848,7 +848,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 
 - job-template:
@@ -1087,7 +1087,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-docs-merge-{stream}'
@@ -1170,7 +1170,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 
 - job-template:
@@ -1238,7 +1238,7 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90
 
 - job-template:
     name: 'vpp-make-test-docs-merge-{stream}'
@@ -1321,6 +1321,6 @@
         - naginator:
             rerun-unstable-builds: true
             max-failed-builds: 1
-            fixed-delay: 10
+            fixed-delay: 90