From: wu.zhihui <wu.zhihui1@zte.com.cn>
Date: Wed, 7 Dec 2016 05:12:05 +0000 (+0800)
Subject: qtip: update qtip jenkins template
X-Git-Tag: danube.1.0~583
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F87%2F25587%2F3;p=releng.git

qtip: update qtip jenkins template

- remove offline pods info
- set job description for jenkins dashboard
- simplify job name

JIRA: QTIP-181

Change-Id: Ic12b9931faadc6954a736a0d33e2f3bd06b0d010
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 1c62df634..ac9854365 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -2,7 +2,7 @@
 # job configuration for qtip
 ####################################
 - project:
-    name: qtip-ci-jobs
+    name: qtip
 
     project: 'qtip'
 
@@ -20,22 +20,6 @@
 #        master
 #--------------------------------
     pod:
-        - dell-pod1:
-            installer: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - orange-pod2:
-            installer: joid
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - juniper-pod1:
-            installer: joid
-            <<: *master
-            auto-trigger-name: 'daily-trigger-disabled'
-        - zte-pod1:
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
         - zte-pod2:
             installer: fuel
             auto-trigger-name: 'qtip-daily-zte-pod2-trigger'
@@ -80,6 +64,8 @@
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'qtip-cleanup'
         - 'qtip-daily-ci'
 
@@ -105,22 +91,6 @@
 #################
 #trigger macros
 #################
-
-#- trigger:
-#    name: 'qtip-daily-dell-pod1-trigger'
-#    triggers:
-#        - timed: '0 3 * * *'
-
-#- trigger:
-#    name: 'qtip-daily-juniper-pod1-trigger'
-#    triggers:
-#        - timed : '0 0 * * *'
-
-#- trigger:
-#   name: 'qtip-dailty-orange-pod2-trigger'
-#   triggers:
-#       - timed : ' 0 0 * * *'
-
 - trigger:
     name: 'qtip-daily-zte-pod2-trigger'
     triggers:
diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index 8b406fea5..8798fd115 100644
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -1,22 +1,20 @@
 - project:
-    name: qtip
+    name: qtip-project-jobs
 
-    project: '{name}'
+    project: 'qtip'
 
     jobs:
         - 'qtip-verify-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
 
+################################
+## job templates
+#################################
 - job-template:
     name: 'qtip-verify-{stream}'
 
@@ -58,6 +56,14 @@
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
 
+    builders:
+        - qtip-unit-tests-and-docs-build
+
+################################
+## job builders
+#################################
+- builder:
+    name: qtip-unit-tests-and-docs-build
     builders:
         - shell: |
             #!/bin/bash