Merge "Functest, set exit on error for single suites (set -e)"

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband-project-jobs.yml
similarity index 78%
rename from jjb/armband/armband.yml
rename to jjb/armband/armband-project-jobs.yml
index 75c0e7a..f91e9b1 100644 (file)
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -9,6 +9,7 @@
 
     jobs:
         - 'armband-verify-{stream}'
+        - 'armband-build-daily-{stream}'
 
     stream:
         - master:
@@ -72,15 +73,11 @@
             max-per-node: 1
 
     parameters:
-        - project-parameters:
+        - project-parameter:
             project: '{project}'
         - 'arm-build1-defaults'
-        - choice:
-            name: FORCE_BUILD
-            choices:
-                - 'false'
-                - 'true'
-            description: 'Force build even if there are no changes in the armband repo. Default false'
+        - armband-project-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -89,18 +86,39 @@
             branch: '{branch}'
 
     triggers:
-        -pollscm:
+        - pollscm:
             cron: '0 H/4 * * *'
 
     wrappers:
-        -timeout:
+        - timeout:
             timeout: 360
             fail: true
 
     builders:
         - shell:
-            !include-raw-escape: ./armband-build.sh
+            !include-raw-escape: ./build.sh
 
     publishers:
         - email:
             recipients: josep.puigdemont@enea.com armband@enea.com
+
+########################
+# parameter macros
+########################
+- parameter:
+    name: armband-project-parameter
+    parameters:
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: GS_URL
+            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
+            description: "URL to Google Storage."
+        - choice:
+            name: FORCE_BUILD
+            choices:
+                - 'false'
+                - 'true'
+            description: 'Force build even if there are no changes in the armband repo. Default false'

diff --git a/jjb/armband/armband-build.sh b/jjb/armband/build.sh
similarity index 100%
rename from jjb/armband/armband-build.sh
rename to jjb/armband/build.sh

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3d2527c..1e16fcf 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -94,6 +94,9 @@
         - nokia-pod1:
             installer: apex
             <<: *master
+        - arm-pod1:
+            installer: fuel
+            <<: *master
 #--------------------------------
 
     testsuite:

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 2431ade..2ca4459 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -597,3 +597,18 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+    name: 'arm-pod1-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - arm-pod1
+            default-slaves:
+                - arm-pod1
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'

diff --git a/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js b/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js
index 6778332..4d909c8 100644 (file)
--- a/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js
+++ b/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js
@@ -56,13 +56,13 @@ var opnfv_dashboard_testcases = {
 var opnfv_dashboard_installers_pods = {};\r
 opnfv_dashboard_installers_pods['apex'] = ['all','intel-pod7','opnfv-jump-1'];\r
 opnfv_dashboard_installers_pods['compass'] = ['all','huawei-us-deploy-bare-1','huawei-us-deploy-vm-1','huawei-us-deploy-vm2','intel-pod8'];\r
-opnfv_dashboard_installers_pods['fuel'] = ['all','ericsson-pod2','opnfv-jump-2'];\r
+opnfv_dashboard_installers_pods['fuel'] = ['all','ericsson-pod2','opnfv-jump-2','arm-pod1'];\r
 opnfv_dashboard_installers_pods['joid'] = ['all','intel-pod5','intel-pod6','orange-fr-pod2'];\r
 \r
 var opnfv_dashboard_installers_pods_print = {};\r
 opnfv_dashboard_installers_pods_print['apex'] = ['all','intelpod7','opnfvjump1'];\r
 opnfv_dashboard_installers_pods_print['compass'] = ['all','hwusbare1','hwusvm1','hwusvm2','intelpod8'];\r
-opnfv_dashboard_installers_pods_print['fuel'] = ['all','ericssonpod2','opnfvjump2'];\r
+opnfv_dashboard_installers_pods_print['fuel'] = ['all','ericssonpod2','opnfvjump2','armpod1'];\r
 opnfv_dashboard_installers_pods_print['joid'] = ['all','intelpod5','intelpod6','orangefrpod2'];\r
 \r
 var opnfv_dashboard_file_directory = 'res-test';\r