fuel: Create job for os-odl_l2-sfc-ha scenario

The trigger times are configured as below due to addition of SFC scenario

os-nosdn-nofeature-ha   : 10:00, every day for both branches
os-nosdn-ovs-ha         : 15:00, every day for both branches
os-odl_l2-bgpvpn-ha     : 20:00, every day for both branches
os-odl_l3-nofeature-ha  : 06:00, every day for both branches
os-odl_l2-nofeature-ha  : 02:00, every 5th day for both branches
os-onos-nofeature-ha    : 14:00, every 5th day for both branches
os-nosdn-kvm-ha (bm)    : disabled

os-nosdn-kvm-noha and os-odl_l2-sfc-ha triggers are currently disabled.

Change-Id: Id0b945b85cf55d4d93b7146bb6f143c2adebb895
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index a7c7de0..52a7aa5 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -55,13 +55,15 @@
         - 'os-onos-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-ovs-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-bgpvpn-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-sfc-ha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm_ovs-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-vlan-ha':
@@ -76,13 +78,15 @@
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm-noha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm_ovs-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-ovs-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l2-bgpvpn-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-odl_l2-sfc-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
 
     jobs:
         - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -299,7 +303,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 1 * * */5'
+        - timed: '0 2 * * */5'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -323,7 +327,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 1 * * */5'
+        - timed: '0 2 * * */5'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -333,7 +337,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: '0 6 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -357,7 +361,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: '0 6 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -367,7 +371,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 13 * * */5'
+        - timed: '0 14 * * */5'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -391,7 +395,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 13 * * */5'
+        - timed: '0 14 * * */5'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -402,7 +406,7 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 15 * * *'
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -426,7 +430,7 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 16 * * *'
+        - timed: '0 15 * * *'
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -436,7 +440,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: '0 20 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -460,12 +464,46 @@
 - trigger:
     name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: '0 20 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 
+# os-odl_l2-sfc-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 1 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 1 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
 # os-nosdn-kvm-ha trigger
 - trigger:
     name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger'

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 62f2340..6f0fdfc 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -88,4 +88,14 @@ $DEPLOY_COMMAND
 
 echo
 echo "--------------------------------------------------------"
-echo "Done!"
+echo "Deployment is done successfully!"
+
+# Quick and dirty fix for SFC scenatio - will be fixed properly post-release
+if [[ "$DEPLOY_SCENARIO" !~ "os-odl_l2-sfc" ]]; then
+    exit 0
+fi
+
+echo "SFC Scenario is deployed"
+
+# TBD: This is where we need to transfer poc.tacker-up.ssh script to
+# controller + ODL node