X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-weekly-jobs.yml;h=5a162bb7f065e588d0b79a2fc2bc6e73b10903aa;hb=d63b62357077891d9395d351fd85e97d31ad87fc;hp=66c05e243ef34c91e5434176c9b004235ac5d35d;hpb=d406fb03948296cdd02c7b93ffb9433ceb39d872;p=releng.git

diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml
index 66c05e243..5a162bb7f 100644
--- a/jjb/dovetail/dovetail-weekly-jobs.yml
+++ b/jjb/dovetail/dovetail-weekly-jobs.yml
@@ -1,124 +1,127 @@
+---
 - project:
     name: dovetail-weekly-jobs
     project: dovetail
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        dovetail-branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
-        branch: 'stable/{stream}'
-        dovetail-branch: master
-        gs-pathname: '/{stream}'
-        docker-tag: 'latest'
+      stream: master
+      branch: '{stream}'
+      dovetail-branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: 'latest'
+    danube: &danube
+      stream: danube
+      branch: 'stable/{stream}'
+      dovetail-branch: master
+      gs-pathname: '/{stream}'
+      docker-tag: 'latest'
 
-#--------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#--------------------------------
-#    Installers using labels
-#            CI PODs
-# This section should only contain the installers
-# that have been switched using labels for slaves
-#--------------------------------
+    # -------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -------------------------------
+    #    Installers using labels
+    #            CI PODs
+    # This section should only contain the installers
+    # that have been switched using labels for slaves
+    # -------------------------------
     pod:
-#        - baremetal:
-#            slave-label: apex-baremetal
-#            sut: apex
-#            <<: *colorado
-        - baremetal:
-            slave-label: compass-baremetal
-            sut: compass
-            <<: *colorado
-#        - baremetal:
-#            slave-label: fuel-baremetal
-#            sut: fuel
-#            <<: *master
-#        - baremetal:
-#            slave-label: joid-baremetal
-#            sut: joid
-#            <<: *colorado
+      # - baremetal:
+      #     slave-label: apex-baremetal
+      #     SUT: apex
+      #     <<: *danube
+      - baremetal:
+          slave-label: compass-baremetal
+          SUT: compass
+          <<: *danube
+    # - baremetal:
+    #     slave-label: fuel-baremetal
+    #     SUT: fuel
+    #     <<: *danube
+    # - baremetal:
+    #     slave-label: joid-baremetal
+    #     SUT: joid
+    #     <<: *danube
 
     testsuite:
-        - 'debug'
-        - 'proposed_tests'
-        - 'compliance_set'
+      - 'debug'
+      - 'compliance_set'
+      - 'proposed_tests'
 
     loop:
-        - 'weekly':
-            job-timeout: 60
+      - 'weekly':
+          job-timeout: 180
 
     jobs:
-        - 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+      - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
 
 ################################
 # job template
 ################################
 - job-template:
-    name: 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+    name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: '{job-timeout}'
-            abort: true
+      - build-name:
+          name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '{job-timeout}'
+          abort: true
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{sut}-defaults'
-        - '{slave-label}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull dovetail docker image'
-        - string:
-            name: CI_DEBUG
-            default: 'true'
-            description: "Show debug output information"
-        - string:
-            name: TESTSUITE
-            default: '{testsuite}'
-            description: "dovetail testsuite to run"
-        - string:
-            name: DOVETAIL_REPO_DIR
-            default: "/home/opnfv/dovetail"
-            description: "Directory where the dovetail repository is cloned"
+      - project-parameter:
+          project: '{project}'
+          branch: '{dovetail-branch}'
+      - '{SUT}-defaults'
+      - '{slave-label}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull dovetail docker image'
+      - string:
+          name: CI_DEBUG
+          default: 'true'
+          description: "Show debug output information"
+      - string:
+          name: TESTSUITE
+          default: '{testsuite}'
+          description: "dovetail testsuite to run"
+      - string:
+          name: DOVETAIL_REPO_DIR
+          default: "/home/opnfv/dovetail"
+          description: "Directory where the dovetail repository is cloned"
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - 'dovetail-cleanup'
-        - 'dovetail-run'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - 'dovetail-cleanup'
+      - 'dovetail-run'
 
     publishers:
-        - archive:
-            artifacts: 'results/**/*'
-            allow-empty: true
-            fingerprint: true
+      - archive:
+          artifacts: 'results/**/*'
+          allow-empty: true
+          fingerprint: true
+      - email-jenkins-admins-on-failure
 
 ########################
 # builder macros
@@ -126,10 +129,11 @@
 - builder:
     name: dovetail-run-weekly
     builders:
-        - shell:
-            !include-raw: ./dovetail-run.sh
+      - shell:
+          !include-raw: ./dovetail-run.sh
+
 - builder:
     name: dovetail-cleanup-weekly
     builders:
-        - shell:
-            !include-raw: ./dovetail-cleanup.sh
+      - shell:
+          !include-raw: ./dovetail-cleanup.sh