fix ci jobs (daily && no branch param)

[releng.git] / jjb / qtip / qtip-ci-jobs.yml

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 1c62df6..b83014e 100644 (file)
--- 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'
@@ -60,6 +44,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{pod}-defaults'
         - string:
@@ -71,15 +57,14 @@
             description: 'Tag to pull docker image'
 
     scm:
-        - git-scm:
-              credentials-id: '{ssh-credentials}'
-              refspec: ''
-              branch: '{branch}'
+        - git-scm
 
     triggers:
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'qtip-cleanup'
         - 'qtip-daily-ci'
 
@@ -105,22 +90,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: