merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 5568f78..4d92980 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -103,22 +103,22 @@
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
 #armband CI PODs
-        - armband_baremetal:
+        - armband-baremetal:
             slave-label: armband-baremetal
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - armband_virtual:
+        - armband-virtual:
             slave-label: armband-virtual
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - armband_baremetal:
+        - armband-baremetal:
             slave-label: armband-baremetal
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
-        - armband_virtual:
+        - armband-virtual:
             slave-label: armband-virtual
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
@@ -145,7 +145,7 @@
     testsuite:
         - 'debug'
         - 'proposed_tests'
-        - 'compliace_set'
+        - 'compliance_set'
 
     jobs:
         - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
@@ -161,6 +161,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -179,6 +180,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - '{SUT}-defaults'
         - '{slave-label}-defaults'
         - string:
@@ -202,10 +204,7 @@
             description: "Directory where the dovetail repository is cloned"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{dovetail-branch}'
+        - git-scm
 
     builders:
         - description-setter:
@@ -228,13 +227,6 @@
         - shell:
             !include-raw: ./dovetail-run.sh
 
-
-- builder:
-    name: dovetail-fetch-os-creds
-    builders:
-        - shell:
-            !include-raw: ../../utils/fetch_os_creds.sh
-
 - builder:
     name: dovetail-cleanup
     builders: