Merge "[Compass] Add new scenarios"

diff --combined jjb/compass4nfv/compass-ci-jobs.yml
index 7408447,d38a67b..1cf81a1
--- 1/jjb/compass4nfv/compass-ci-jobs.yml
--- 2/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@@ -123,6 -123,12 +123,12 @@@
        - 'os-nosdn-bar-ha':
            disabled: false
            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+       - 'k8-nosdn-stor4nfv-ha':
+           disabled: false
+           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+       - 'k8-nosdn-stor4nfv-noha':
+           disabled: false
+           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
  
      jobs:
        - 'compass-{scenario}-{pod}-daily-{stream}'
@@@ -168,6 -174,9 +174,6 @@@
            installer: '{installer}'
            gs-pathname: '{gs-pathname}'
            ppa-pathname: '{ppa-pathname}'
 -      - string:
 -          name: DEPLOY_SCENARIO
 -          default: '{scenario}'
        - '{slave-label}-defaults'
        - '{installer}-defaults'
  
@@@ -426,17 -435,6 +432,17 @@@
            name: LOG_DIRECTORY
            default: $WORKSPACE/log_output
            description: "Directory where the logs will be located upon the completion of the collection."
 +      - string:
 +          name: DEPLOY_SCENARIO
 +          default: 'os-nosdn-nofeature-ha'
 +          description: "Scenario to deploy with."
 +      - string:
 +          name: COMPASS_OS_VERSION
 +          default: ''
 +      - string:
 +          name: COMPASS_OPENSTACK_VERSION
 +          default: ''
 +
  
  ########################
  # trigger macros
@@@ -497,6 -495,10 +503,10 @@@
      name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger'
      triggers:
        - timed: ''  # '0 19 * * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
+     triggers:
+       - timed: ''
  
  # ----------------------------
  # noha-baremetal-centos-master
@@@ -525,6 -527,11 +535,11 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger'
+     triggers:
+       - timed: ''
+ 
  
  # --------------------------
  # ha-huawei-pod7-danube
@@@ -581,6 -588,10 +596,10 @@@
      name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger'
      triggers:
        - timed: ''  # '0 19 * * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
+     triggers:
+       - timed: ''
  
  # ----------------------------
  # noha-huawei-pod7-danube
@@@ -609,6 -620,10 +628,10 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger'
+     triggers:
+       - timed: ''
  
  # -------------------
  # ha-baremetal-master
@@@ -665,6 -680,10 +688,10 @@@
      name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger'
      triggers:
        - timed: '0 2 2-30/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger'
+     triggers:
+       - timed: ''
  
  # ---------------------
  # noha-baremetal-master
@@@ -693,6 -712,10 +720,10 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger'
+     triggers:
+       - timed: ''
  
  # -------------------
  # ha-baremetal-euphrates
@@@ -749,6 -772,10 +780,10 @@@
      name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
      triggers:
        - timed: '0 21 1-29/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger'
+     triggers:
+       - timed: ''
  
  # ---------------------
  # noha-baremetal-euphrates
@@@ -777,6 -804,10 +812,10 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+     triggers:
+       - timed: ''
  
  # -----------------
  # ha-virtual-master
@@@ -833,6 -864,10 +872,10 @@@
      name: 'compass-os-nosdn-bar-ha-virtual-master-trigger'
      triggers:
        - timed: '0 17 1-29/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger'
+     triggers:
+       - timed: '0 15 2-30/2 * *'
  
  # -------------------
  # noha-virtual-master
@@@ -861,6 -896,10 +904,10 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
      triggers:
        - timed: '0 11 2-30/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger'
+     triggers:
+       - timed: '0 10 2-30/2 * *'
  
  # -----------------
  # ha-virtual-euphrates
@@@ -917,6 -956,10 +964,10 @@@
      name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
      triggers:
        - timed: '0 19 1-29/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger'
+     triggers:
+       - timed: ''  # '0 14 1-29/2 * *'
  
  # -------------------
  # noha-virtual-euphrates
@@@ -945,3 -988,7 +996,7 @@@
      name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
      triggers:
        - timed: '0 12 2-30/2 * *'
+ - trigger:
+     name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+     triggers:
+       - timed: ''  # '0 12 2-30/2 * *'