Merge "Add baremetal node for puppet-infracloud"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 946ecac..16c6695 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -40,6 +40,10 @@
 #        master
 #--------------------------------
         - huawei-pod2:
+            slave-label: '{pod}'
+            os-version: 'trusty'
+            <<: *colorado
+        - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
             <<: *master
@@ -245,35 +249,68 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: '0 23 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
+    triggers:
+        - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 19 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 23 * * *'
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-pod2-colorado-trigger'
     triggers:
         - timed: '0 11 * * *'
 - trigger:
-    name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-onos-sfc-ha-huawei-pod2-colorado-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-ha-huawei-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger'
     triggers:
         - timed: ''
 

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 2d0bbfb..b53082e 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -92,7 +92,9 @@
             description: 'OpenStack credentials'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
-        - 'functest-suite-parameter'
+        - 'functest-suite-parameter':
+            FUNCTEST_SUITE_NAME: '{project}'
+            TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/{project}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'
@@ -137,5 +139,4 @@
                 notbuilt: true
 
     builders:
-        - 'functest-suite-builder':
-            TESTCASE_OPTIONS: '-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+        - 'functest-suite-builder'

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 7120790..d5b99b2 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -129,6 +129,10 @@
             installer: joid
             <<: *master
         - huawei-pod2:
+            slave-label: '{pod}'
+            installer: compass
+            <<: *colorado
+        - huawei-pod5:
             slave-label: '{pod}'
             installer: compass
             <<: *master

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index b2f17c1..ff24e9e 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -435,6 +435,19 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+    name: 'huawei-pod5-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-pod5
+            default-slaves:
+                - huawei-pod5
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
 - parameter:
     name: 'zte-pod1-defaults'
     parameters:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index d0794eb..1cb1c97 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -181,7 +181,7 @@
             slave-label: '{pod}'
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
+            <<: *colorado
         - huawei-pod3:
             slave-label: '{pod}'
             installer: compass
@@ -192,6 +192,11 @@
             installer: compass
             auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
             <<: *master
+        - huawei-pod5:
+            slave-label: '{pod}'
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
 #--------------------------------
     testsuite:
         - 'daily'
@@ -374,6 +379,14 @@
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-huawei-pod5'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: '-i 104.197.68.199:8086'
+            description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-zte-pod1'
     parameters: