From: meimei <meimei@huawei.com>
Date: Fri, 26 Feb 2016 02:38:38 +0000 (+0800)
Subject: [compass] add jobs of deploying centos7
X-Git-Tag: colorado.1.0~641
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=71237ad565449c8da1e5add9fcb4840a813bf855;p=releng.git

[compass] add jobs of deploying centos7

Change-Id: Iae7d280e7b45a8dcaa61f3bedea8a7f5c4d5ad82
Signed-off-by: meimei <meimei@huawei.com>
---

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b3438d799..dd046c1c7 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -23,15 +23,22 @@
 #        brahmaputra
 #--------------------------------
         - huawei-us-deploy-bare-1:
+            os-version: 'trusty'
             <<: *brahmaputra
         - huawei-virtual:
+            os-version: 'trusty'
             <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
+        - huawei-us-deploy-bare-2:
+            os-version: 'centos7'
+            <<: *master
         - intel-pod8:
+            os-version: 'trusty'
             <<: *master
         - huawei-virtual:
+            os-version: 'trusty'
             <<: *master
 
     scenario:
@@ -99,6 +106,7 @@
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
+                COMPASS_OS_VERSION={os-version}
               same-node: true
               block: true
         - trigger-builds:
@@ -200,15 +208,30 @@
             choices:
                 - 'liberty'
                 - 'juno'
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'trusty'
-                - 'centos7'
 
 ########################
 # trigger macros
 ########################
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
     triggers:
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 475cc2c6c..0090f13b0 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -231,6 +231,25 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'huawei-us-deploy-bare-2-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - huawei-us-deploy-bare-2
+            default-slaves:
+                - huawei-us-deploy-bare-2
+        - string:
+            name: INSTALLER_VERSION
+            default: stable
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+
 - parameter:
     name: 'huawei-virtual-defaults'
     parameters: