Merge "add missing dist files ignored by .gitignore"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index d8b9eb1..43a0b9f 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -152,9 +152,8 @@
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -286,11 +285,9 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -429,7 +426,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -1127,7 +1124,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -1235,7 +1231,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index dd8af6a..a3c56cd 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -152,9 +152,8 @@
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -286,11 +285,9 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -429,7 +426,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -766,7 +763,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -874,7 +870,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 61845ac..7cd7348 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -157,19 +157,25 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        #dovetail only master by now, not sync with A/B/C branches
-        #here the stream means the SUT stream, dovetail stream is defined in its own job
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+        # dovetail only master by now, not sync with A/B/C branches
+        # here the stream means the SUT stream, dovetail stream is defined in its own job
+        # only run on os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha scenario
+        - conditional-step:
+            condition-kind: regex-match
+            regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha
+            label: ${scenario}
+            steps:
+                - trigger-builds:
+                    - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                      current-parameters: false
+                      predefined-parameters:
+                        DEPLOY_SCENARIO={scenario}
+                      block: true
+                      same-node: true
+                      block-thresholds:
+                      build-step-failure-threshold: 'never'
+                      failure-threshold: 'never'
+                      unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-daily-{stream}'

diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
index 869c395..6768906 100755 (executable)
--- a/jjb/functest/functest-loop.sh
+++ b/jjb/functest/functest-loop.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set +e
 
-
+[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
 cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}"
 
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)