Merge "Remove colorado jobs and create danube jobs"

diff --combined jjb/armband/armband-ci-jobs.yml
index 723811f,62f2a1a..4e88678
--- 1/jjb/armband/armband-ci-jobs.yml
--- 2/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@@ -10,26 -10,28 +10,28 @@@
          stream: master
          branch: '{stream}'
          gs-pathname: ''
-     colorado: &colorado
-         stream: colorado
+         disabled: false
+     danube: &danube
+         stream: danube
          branch: 'stable/{stream}'
          gs-pathname: '/{stream}'
+         disabled: true
  #--------------------------------
  # POD, INSTALLER, AND BRANCH MAPPING
  #--------------------------------
  # CI POD's
  #--------------------------------
- #        colorado
+ #        danube
  #--------------------------------
      pod:
          - armband-baremetal:
              slave-label: armband-baremetal
              installer: fuel
-             <<: *colorado
+             <<: *danube
          - armband-virtual:
              slave-label: armband-virtual
              installer: fuel
-             <<: *colorado
+             <<: *danube
  #--------------------------------
  #        master
  #--------------------------------
@@@ -44,16 -46,16 +46,16 @@@
  #--------------------------------
  # NONE-CI POD's
  #--------------------------------
- #        colorado
+ #        danube
  #--------------------------------
          - arm-pod2:
              slave-label: arm-pod2
              installer: fuel
-             <<: *colorado
+             <<: *danube
          - arm-pod3:
              slave-label: arm-pod3
              installer: fuel
-             <<: *colorado
+             <<: *danube
  #--------------------------------
  #        master
  #--------------------------------
@@@ -97,6 -99,8 +99,8 @@@
  - job-template:
      name: '{installer}-{scenario}-{pod}-daily-{stream}'
  
+     disabled: '{obj:disabled}'
+ 
      concurrent: false
  
      properties:
@@@ -256,23 -260,23 +260,23 @@@
  - trigger:
      name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger'
      triggers:
 -        - timed: '0 0 * * 1'
 +        - timed: '0 8 * * 1,3,5,7'
  - trigger:
      name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
      triggers:
 -        - timed: '0 0 * * 2'
 +        - timed: '0 16 * * 2,7'
  - trigger:
      name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger'
      triggers:
 -        - timed: '0 0 * * 3'
 +        - timed: '0 16 * * 1,4,6'
  - trigger:
      name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger'
      triggers:
 -        - timed: '0 0 * * 4'
 +        - timed: '0 8 * * 2,4,6'
  - trigger:
      name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger'
      triggers:
 -        - timed: '0 0 * * 5'
 +        - timed: '0 16 * * 3,5'
  - trigger:
      name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-master-trigger'
      triggers:
@@@ -283,34 -287,34 +287,34 @@@
          - timed: '0 0 * * 7'
  
  #----------------------------------------------------------------------
- # Enea Armband CI Baremetal Triggers running against colorado branch
+ # Enea Armband CI Baremetal Triggers running against danube branch
  #----------------------------------------------------------------------
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-danube-trigger'
      triggers:
 -        - timed: '0 8 * * 1,3,5,7'
 +        - timed: '0 0 * * 1'
  - trigger:
-     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-danube-trigger'
      triggers:
 -        - timed: '0 16 * * 2,7'
 +        - timed: '0 0 * * 2'
  - trigger:
-     name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-danube-trigger'
      triggers:
 -        - timed: '0 8 * * 2,4,6'
 +        - timed: '0 0 * * 4'
  - trigger:
-     name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-danube-trigger'
      triggers:
 -        - timed: '0 16 * * 1,4,6'
 +        - timed: '0 0 * * 3'
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-danube-trigger'
      triggers:
 -        - timed: '0 16 * * 3,5'
 +        - timed: '0 0 * * 5'
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-danube-trigger'
      triggers:
          - timed: ''
  #---------------------------------------------------------------
@@@ -345,34 -349,34 +349,34 @@@
      triggers:
          - timed: '0 2 * * 7'
  #--------------------------------------------------------------------
- # Enea Armband CI Virtual Triggers running against colorado branch
+ # Enea Armband CI Virtual Triggers running against danube branch
  #--------------------------------------------------------------------
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-danube-trigger'
      triggers:
          - timed: ''
  #----------------------------------------------------------
@@@ -407,34 -411,34 +411,34 @@@
      triggers:
          - timed: ''
  #---------------------------------------------------------------
- # Enea Armband POD 2 Triggers running against colorado branch
+ # Enea Armband POD 2 Triggers running against danube branch
  #---------------------------------------------------------------
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-danube-trigger'
      triggers:
          - timed: ''
  #----------------------------------------------------------
@@@ -469,33 -473,33 +473,33 @@@
      triggers:
          - timed: ''
  #---------------------------------------------------------------
- # Enea Armband POD 3 Triggers running against colorado branch
+ # Enea Armband POD 3 Triggers running against danube branch
  #---------------------------------------------------------------
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''
  - trigger:
-     name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-colorado-trigger'
+     name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-danube-trigger'
      triggers:
          - timed: ''

diff --combined jjb/barometer/barometer.yml
index 41a80ad,27e1f83..e789b7f
--- 1/jjb/barometer/barometer.yml
--- 2/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@@ -17,10 -17,10 +17,10 @@@
              branch: '{stream}'
              gs-pathname: ''
              disabled: false
-         - colorado:
+         - danube:
              branch: 'stable/{stream}'
              gs-pathname: '/{stream}'
-             disabled: false
+             disabled: true
  
  - job-template:
      name: 'barometer-verify-{stream}'
@@@ -115,8 -115,8 +115,8 @@@
              pwd
              cd src
              ./install_build_deps.sh
 -            sudo make clobber
 -            sudo make
 +            make clobber
 +            make
  
  - job-template:
      name: 'barometer-daily-{stream}'
@@@ -152,5 -152,5 +152,5 @@@
              pwd
              cd src
              ./install_build_deps.sh
 -            sudo make clobber
 -            sudo make
 +            make clobber
 +            make

diff --combined jjb/compass4nfv/compass-verify-jobs.yml
index 8feda04,c1179d7..6ef5fbb
--- 1/jjb/compass4nfv/compass-verify-jobs.yml
--- 2/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@@ -12,10 -12,10 +12,10 @@@
              branch: '{stream}'
              gs-pathname: ''
              disabled: false
-         - colorado:
+         - danube:
              branch: 'stable/{stream}'
              gs-pathname: '/{stream}'
-             disabled: true
+             disabled: false
  
      distro:
          - 'xenial':
@@@ -132,24 -132,17 +132,24 @@@
                    node-parameters: true
                    kill-phase-on: FAILURE
                    abort-all-job: true
 -#        - multijob:
 -#            name: smoke-test
 -#            condition: SUCCESSFUL
 -#            projects:
 -#                - name: 'functest-compass-virtual-suite-{stream}'
 -#                  current-parameters: true
 -#                  predefined-parameters:
 -#                    FUNCTEST_SUITE_NAME=healthcheck
 -#                  node-parameters: true
 -#                  kill-phase-on: NEVER
 -#                  abort-all-job: true
 +        - multijob:
 +            name: smoke-test
 +            condition: SUCCESSFUL
 +            projects:
 +                - name: 'functest-compass-virtual-suite-{stream}'
 +                  current-parameters: true
 +                  predefined-parameters:
 +                    FUNCTEST_SUITE_NAME=healthcheck
 +                  node-parameters: true
 +                  kill-phase-on: NEVER
 +                  abort-all-job: true
 +                - name: 'functest-compass-virtual-suite-{stream}'
 +                  current-parameters: true
 +                  predefined-parameters:
 +                    FUNCTEST_SUITE_NAME=vping_ssh
 +                  node-parameters: true
 +                  kill-phase-on: NEVER
 +                  abort-all-job: true
  
  - job-template:
      name: 'compass-verify-{phase}-{distro}-{stream}'

diff --combined jjb/doctor/doctor.yml
index e225a12,72d88c8..ab9ef8f
--- 1/jjb/doctor/doctor.yml
--- 2/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@@ -9,7 -9,7 +9,7 @@@
              gs-pathname: ''
              docker-tag: 'master'
              disabled: false
-         - colorado:
+         - danube:
              branch: 'stable/{stream}'
              gs-pathname: '/{stream}'
              docker-tag: 'stable'
@@@ -233,4 -233,3 +233,4 @@@
                  failed: true
                  unstable: true
                  notbuilt: true
 +            silent-start: true