Merge "remove scenarios"

diff --combined jjb/compass4nfv/compass-ci-jobs.yml
index f8c8a31,319269a..09ef441
--- 1/jjb/compass4nfv/compass-ci-jobs.yml
--- 2/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@@ -182,7 -182,6 +182,7 @@@
                        WED: true
                        FRI: true
                        SUN: true
 +                  use-build-time: true
              steps:
                  - trigger-builds:
                      - project: 'dovetail-compass-{pod}-proposed_tests-master'
@@@ -207,10 -206,9 +207,10 @@@
                  - condition-kind: day-of-week
                    day-selector: select-days
                    days:
 -                      TUE: true
 -                      THU: true
 +                      TUES: true
 +                      THURS: true
                        SAT: true
 +                  use-build-time: true
              steps:
                  - trigger-builds:
                      - project: 'dovetail-compass-{pod}-proposed_tests-danube'
@@@ -227,7 -225,7 +227,7 @@@
              condition-kind: and
              condition-operands:
                  - condition-kind: regex-match
 -                  regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha
 +                  regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha
                    label: '{scenario}'
                  - condition-kind: regex-match
                    regex: master
@@@ -322,15 -320,15 +322,15 @@@
  - trigger:
      name: 'compass-os-onos-nofeature-ha-baremetal-centos-master-trigger'
      triggers:
-         - timed: '0 7 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-ocl-nofeature-ha-baremetal-centos-master-trigger'
      triggers:
-         - timed: '0 11 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-onos-sfc-ha-baremetal-centos-master-trigger'
      triggers:
-         - timed: '0 3 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-baremetal-centos-master-trigger'
      triggers:
@@@ -347,7 -345,7 +347,7 @@@
  - trigger:
      name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
      triggers:
-         - timed: '0 3 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
      triggers:
@@@ -359,15 -357,15 +359,15 @@@
  - trigger:
      name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
      triggers:
-         - timed: '0 14 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
      triggers:
-         - timed: '0 10 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
      triggers:
-         - timed: '0 6 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
      triggers:
@@@ -421,7 -419,7 +421,7 @@@
  - trigger:
      name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
      triggers:
-         - timed: '0 22 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
      triggers:
@@@ -433,19 -431,19 +433,19 @@@
  - trigger:
      name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
      triggers:
-         - timed: '0 18 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
      triggers:
-         - timed: '0 16 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
      triggers:
-         - timed: '0 15 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
      triggers:
-         - timed: '0 14 * * *'
+         - timed: ''
  - trigger:
      name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
      triggers: