X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffuel%2Ffuel-ci-jobs.yml;h=e32834589ea99038403b8dee8d277429cb9035d9;hb=a54a38f6c3304cf0a4cd01b08d0b8c91bb446e5f;hp=9df7a64db0a520fa70ea7e43a26ddec52b432940;hpb=354761f94cdd7283740a487d5384ef9b233b66c3;p=releng.git

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 9df7a64db..e32834589 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -37,11 +37,6 @@
         - virtual:
             slave-label: fuel-virtual
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: '{pod}'
-            <<: *master
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -59,12 +54,14 @@
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-        - 'os-onos-nofeature-ha':
+        - 'os-onos-sfc-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-        - 'os-odl_l2-bgpvpn-ha':
+        - 'os-onos-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l2-sfc-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-ovs-ha':
@@ -89,6 +86,7 @@
             enabled: true
             max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -115,6 +113,8 @@
             gs-pathname: '{gs-pathname}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - trigger-builds:
             - project: 'fuel-deploy-{pod}-daily-{stream}'
               current-parameters: false
@@ -159,6 +159,7 @@
             enabled: true
             max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -189,6 +190,8 @@
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
@@ -227,76 +230,41 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 0 * * *'
+        - timed: '0 20 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 23 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
+    name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 5 * * *'
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
+    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 12 * * *'
+        - timed: '0 8 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
-    triggers:
-        - timed: '0 18 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
-    triggers:
-        - timed: '0 21 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
-    triggers:
-        - timed: ''
-#-----------------------------------------------
-# Triggers for job running on lf-pod2 against master branch
-#-----------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-daily-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-daily-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-daily-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-lf-pod2-daily-master-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-daily-master-trigger'
-    triggers:
-        - timed: ''
+        - timed: '0 11 * * *'
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-daily-master-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-lf-pod2-daily-master-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-lf-pod2-daily-master-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-lf-pod2-daily-master-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 #-----------------------------------------------
@@ -314,6 +282,10 @@
     name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
     triggers:
@@ -348,11 +320,15 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
-        - timed: '0 12 * * *'
+        - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers: