X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-dovetail-jobs.yml;h=c0908634881e88e08deb45f63fc0a716501fa5cb;hb=739c2d9550e34798e31fc4931b9f1afc0a582827;hp=d49d0ec5f9cd79d883409356166af0a0f171e903;hpb=1ad49785b15b78cb4e8ac1231ea526b0021ea416;p=releng.git

diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index d49d0ec5f..c09086348 100644
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -1,38 +1,39 @@
+---
 - project:
 
     name: 'compass-dovetail-jobs'
     installer: 'compass'
     project: 'compass4nfv'
-#----------------------------------
-# BRANCH ANCHORS
-#----------------------------------
-    colorado: &colorado
-        stream: colorado
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        disabled: false
-        dovetail-branch: master
-#------------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#------------------------------------
-#        CI PODs
-#------------------------------------
+    # ---------------------------------
+    # BRANCH ANCHORS
+    # ---------------------------------
+    danube: &danube
+      stream: danube
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      disabled: false
+      dovetail-branch: master
+    # -----------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -----------------------------------
+    #        CI PODs
+    # -----------------------------------
     pod:
-        - baremetal:
-            slave-label: compass-baremetal
-            os-version: 'trusty'
-            <<: *colorado
-#-----------------------------------
-# scenarios
-#-----------------------------------
+      - baremetal:
+          slave-label: compass-baremetal-branch
+          os-version: 'xenial'
+          <<: *danube
+    # ----------------------------------
+    # scenarios
+    # ----------------------------------
     scenario:
-        - 'os-nosdn-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
+      - 'os-nosdn-nofeature-ha':
+          disabled: true
+          auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
 
     jobs:
-        - 'compass-{scenario}-{pod}-weekly-{stream}'
-        - 'compass-deploy-{pod}-weekly-{stream}'
+      - 'compass-{scenario}-{pod}-weekly-{stream}'
+      - 'compass-deploy-{pod}-weekly-{stream}'
 
 ########################
 # job templates
@@ -45,80 +46,67 @@
     concurrent: false
 
     properties:
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-os-.*?-{pod}-weekly-.*?'
-            block-level: 'NODE'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-os-.*?-{pod}-daily-.*?'
+            - 'compass-os-.*?-{pod}-weekly-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - fix-workspace-permissions
 
     triggers:
-        - '{auto-trigger-name}'
+      - '{auto-trigger-name}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-dovetail-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
-
-    triggers:
-        - '{auto-trigger-name}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-dovetail-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - trigger-builds:
-            - project: 'compass-deploy-{pod}-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO={scenario}
-                COMPASS_OS_VERSION={os-version}
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-debug-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - trigger-builds:
+          - project: 'compass-deploy-{pod}-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              COMPASS_OS_VERSION={os-version}
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-weekly-{stream}'
@@ -128,52 +116,48 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-deploy-{pod}-daily-.*?'
-                - 'compass-deploy-{pod}-weekly-.*'
-                - 'compass-verify-deploy-.*?'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-deploy-{pod}-daily-.*?'
+            - 'compass-deploy-{pod}-weekly-.*'
+            - 'compass-verify-deploy-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 120
-            abort: true
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 240
+          abort: true
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-dovetail-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-dovetail-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
 
     scm:
-        - git-scm
-
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./compass-download-artifact.sh
-        - shell:
-            !include-raw-escape: ./compass-deploy.sh
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - shell:
+          !include-raw-escape: ./compass-download-artifact.sh
+      - shell:
+          !include-raw-escape: ./compass-deploy.sh
 
 ########################
 # parameter macros
@@ -181,28 +165,28 @@
 - parameter:
     name: compass-dovetail-parameter
     parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build_output
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'mitaka'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+      - string:
+          name: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "URL to Google Storage."
+      - choice:
+          name: COMPASS_OPENSTACK_VERSION
+          choices:
+            - 'newton'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-colorado-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger'
     triggers:
-        - timed: 'H H * * 0'
+      - timed: ''  # 'H H * * 0'
 
 - trigger:
     name: 'dovetail-weekly-trigger'
     triggers:
-        - timed: 'H H * * 0'
+      - timed: ''  # 'H H * * 0'