summaryrefslogtreecommitdiffstats
path: root/jjb/joid
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/joid')
-rw-r--r--jjb/joid/joid-daily-jobs.yml20
-rw-r--r--jjb/joid/joid-deploy.sh3
2 files changed, 20 insertions, 3 deletions
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 1ff260ac8..1c7b8cd0d 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -70,6 +70,8 @@
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
- 'k8-ovn-lb-noha':
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-openbaton-ha':
+ auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'joid-{scenario}-{pod}-daily-{stream}'
@@ -400,3 +402,21 @@
name: 'joid-k8-ovn-lb-noha-cengn-pod1-master-trigger'
triggers:
- timed: ''
+
+# os-nosdn-openbaton-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 25 * * *'
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-orange-pod1-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-cengn-pod1-master-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index e197dbd8c..9740d38bf 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -94,9 +94,6 @@ EXTRA=${DEPLOY_OPTIONS[4]}
if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then
SDN_CONTROLLER='odl'
fi
-if [ "$HA_MODE" == 'noha' ]; then
- HA_MODE='nonha'
-fi
# Add extra to features
if [ "$EXTRA" != "" ];then