X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=44cb84d8eb1e9cf004cf5cdb7fdae8cb35df787c;hp=402d3b324416990c6d3564e69ee7c07cfed26bd6;hb=3a76d9e0aff0902c67cc6c22bed79f4a0a02211f;hpb=db6666d61812f940c79f1b00a3223261fd71ad72

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 402d3b324..44cb84d8e 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -54,7 +54,7 @@
       #        master
       # -------------------------------
       - baremetal-centos:
-          slave-label: 'intel-pod8'
+          slave-label: 'intel-pod17'
           os-version: 'centos7'
           <<: *master
       # -------------------------------
@@ -120,10 +120,23 @@
       - 'os-nosdn-ovs_dpdk-noha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-bar-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-bar-noha':
+          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}'
       - 'compass-deploy-{pod}-daily-{stream}'
+      - 'compass-collect-logs-{pod}-daily-{stream}'
 
 ########################
 # job templates
@@ -145,7 +158,9 @@
           use-build-blocker: true
           blocking-jobs:
             - 'compass-os-.*?-{pod}-daily-.*?'
+            - 'compass-k8-.*?-{pod}-daily-.*?'
             - 'compass-os-.*?-baremetal-daily-.*?'
+            - 'compass-k8-.*?-baremetal-daily-.*?'
             - 'compass-verify-[^-]*-[^-]*'
           block-level: 'NODE'
 
@@ -162,9 +177,7 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
+          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -205,12 +218,10 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-      # dovetail only master by now, not sync with A/B/C branches
       # here the stream means the SUT stream, dovetail stream is defined in its own job
-      # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
-      # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
-      # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
-      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
+      # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
+      # run with testsuite default, dovetail docker image with latest tag(Monday, Tuesday)
+      # run with testsuite proposed_tests, dovetail docker image with latest tag(Thursday, Friday)
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -225,7 +236,7 @@
               use-build-time: true
           steps:
             - trigger-builds:
-                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                - project: 'dovetail-compass-{pod}-default-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     DOCKER_TAG=latest
@@ -278,6 +289,45 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{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'
+                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{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'
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: master
+              label: '{stream}'
+          steps:
+            - trigger-builds:
+                - project: 'compass-collect-logs-{pod}-daily-{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}-daily-{stream}'
@@ -303,7 +353,7 @@
       - build-name:
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
       - timeout:
-          timeout: 240
+          timeout: 360
           abort: true
       - fix-workspace-permissions
 
@@ -315,6 +365,7 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
+          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -343,6 +394,42 @@
             - shell:
                 !include-raw-escape: ./compass-deploy.sh
 
+- job-template:
+    name: 'compass-collect-logs-{pod}-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-ci-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+          scenario: '{scenario}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
+
+    scm:
+      - git-scm
+
+    wrappers:
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - fix-workspace-permissions
+
+    builders:
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - shell:
+          !include-raw-escape: ./compass-logs.sh
+
 ########################
 # parameter macros
 ########################
@@ -367,6 +454,21 @@
       - string:
           name: PPA_CACHE
           default: "$WORKSPACE/work/repo/"
+      - string:
+          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: '{scenario}'
+          description: "Scenario to deploy with."
+      - string:
+          name: COMPASS_OS_VERSION
+          default: ''
+      - string:
+          name: COMPASS_OPENSTACK_VERSION
+          default: ''
+
 
 ########################
 # trigger macros
@@ -421,6 +523,14 @@
       - timed: ''
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: '0 6 * * *'
+- trigger:
+    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: ''
 
@@ -451,6 +561,15 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''
+
 
 # --------------------------
 # ha-huawei-pod7-danube
@@ -503,6 +622,14 @@
     name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
+- trigger:
+    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
@@ -531,6 +658,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''
 
 # -------------------
 # ha-baremetal-master
@@ -538,7 +673,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
@@ -550,7 +685,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 1-29/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -566,23 +701,31 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 12 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 10 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 10 * * *'
+      - timed: '0 10 1-29/2 * *'
+- trigger:
+    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: '0 16 1-29/2 * *'
 
 # ---------------------
 # noha-baremetal-master
@@ -611,6 +754,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger'
+    triggers:
+      - timed: ''
 
 # -------------------
 # ha-baremetal-euphrates
@@ -618,7 +769,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 1 * * *'
+      - timed: '0 1 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
     triggers:
@@ -630,7 +781,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 21 * * *'
+      - timed: '0 21 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
@@ -646,15 +797,15 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 5 * * *'
+      - timed: '0 5 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 13 * * *'
+      - timed: '0 13 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 9 * * *'
+      - timed: '0 9 1-29/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
@@ -662,7 +813,15 @@
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
+- trigger:
+    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
@@ -691,6 +850,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: ''
 
 # -----------------
 # ha-virtual-master
@@ -710,7 +877,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 19 * * *'
+      - timed: '0 19 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -726,15 +893,15 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-      - timed: '30 12 * * *'
+      - timed: '30 12 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 13 * * *'
+      - timed: '0 13 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -742,7 +909,15 @@
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
+- trigger:
+    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
@@ -750,27 +925,35 @@
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger'
     triggers:
-      - timed: '30 13 * * *'
+      - timed: '30 13 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 15 * * *'
+      - timed: '0 15 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 11 * * *'
+      - timed: '0 11 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-virtual-master-trigger'
+    triggers:
+      - timed: '0 22 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger'
+    triggers:
+      - timed: '0 10 2-30/2 * *'
 
 # -----------------
 # ha-virtual-euphrates
@@ -778,7 +961,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 23 * * *'
+      - timed: '0 23 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
     triggers:
@@ -790,7 +973,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 22 * * *'
+      - timed: '0 22 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
     triggers:
@@ -806,23 +989,31 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '5 1 * * *'
+      - timed: '5 1 2-30/2 * *'
+- trigger:
+    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
@@ -830,24 +1021,32 @@
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 15 * * *'
+      - timed: '0 15 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 23 * * *'
+      - timed: '0 23 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 21 * * *'
+      - timed: '0 21 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 19 * * *'
+      - timed: '0 19 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 12 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+    triggers:
+      - timed: '0 12 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+    triggers:
+      - timed: ''  # '0 12 2-30/2 * *'