summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml205
-rw-r--r--jjb/joid/joid-deploy.sh34
2 files changed, 214 insertions, 25 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
new file mode 100644
index 000000000..b4b736faa
--- /dev/null
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -0,0 +1,205 @@
+####################################
+# job configuration for bottlenecks
+####################################
+- project:
+ name: bottlenecks-ci-jobs
+
+ project: 'bottlenecks'
+
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+ master: &master
+ stream: master
+ branch: '{stream}'
+ gs-pathname: ''
+ brahmaputra: &brahmaputra
+ stream: brahmaputra
+ branch: 'stable/{stream}'
+ gs-pathname: '{stream}'
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+# brahmaputra
+#--------------------------------
+ pod:
+ - opnfv-jump-2:
+ installer: fuel
+ <<: *brahmaputra
+ - intel-pod5:
+ installer: joid
+ <<: *brahmaputra
+ - huawei-us-deploy-bare-1:
+ installer: compass
+ <<: *brahmaputra
+#--------------------------------
+# master
+#--------------------------------
+ - ericsson-pod1:
+ installer: fuel
+ <<: *master
+ - ericsson-pod2:
+ installer: fuel
+ <<: *master
+ - intel-pod6:
+ installer: joid
+ <<: *master
+ - intel-pod8:
+ installer: compass
+ <<: *master
+ - zte-build-1:
+ installer: fuel
+ <<: *master
+ - orange-pod2:
+ installer: joid
+ <<: *master
+#--------------------------------
+ suite:
+ - 'rubbos'
+ - 'vstf'
+
+ jobs:
+ - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
+
+################################
+# job templates
+################################
+- job-template:
+ name: 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
+
+ disabled: false
+
+ wrappers:
+ - build-name:
+ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - '{pod}-defaults'
+ - '{installer}-defaults'
+ - 'bottlenecks-params-{pod}'
+ - string:
+ name: GERRIT_REFSPEC_DEBUG
+ default: ''
+ description: "Gerrit refspec for debug."
+
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
+ builders:
+ - 'bottlenecks-fetch-os-creds'
+ - 'bottlenecks-run-{suite}'
+
+ publishers:
+ - email:
+ recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com liangqi1@huawei.com liyiting@huawei.com
+
+########################
+# builder macros
+########################
+#- builder:
+# name: bottlenecks-fetch-os-creds
+# builders:
+# - shell:
+# !include-raw ../../utils/fetch_os_creds.sh
+
+#- builder:
+# name: bottlenecks-run-rubbos
+# builders:
+# - shell: |
+# #!/bin/bash
+# set -o errexit
+#
+# echo "Bottlenecks: rubbos running now..."
+# cd $WORKSPACE
+# ./ci/run.sh $GERRIT_REFSPEC_DEBUG
+
+#- builder:
+# name: bottlenecks-run-vstf
+# builders:
+# - shell: |
+# #!/bin/bash
+# set -o errexit
+
+# echo "Bottlenecks: vstf running now..."
+# cd $WORKSPACE
+# ./ci/vstf_run.sh $GERRIT_REFSPEC_DEBUG
+
+########################
+# parameter macros
+########################
+- parameter:
+ name: 'bottlenecks-params-intel-pod5'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-intel-pod6'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-intel-pod8'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-ericsson-pod1'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-ericsson-pod2'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-opnfv-jump-2'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-huawei-us-deploy-bare-1'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-zte-build-1'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'bottlenecks-params-orange-pod2'
+ parameters:
+ - string:
+ name: BOTTLENECKS_DB_TARGET
+ default: '213.77.62.197'
+ description: 'Arguments to use in order to choose the backend DB'
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 5ed33dec2..51ddb313e 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -91,33 +91,15 @@ NFV_FEATURES=${DEPLOY_OPTIONS[2]}
HA_MODE=${DEPLOY_OPTIONS[3]}
EXTRA=${DEPLOY_OPTIONS[4]}
-# Get the juju config path with those options, later we will directly use
-# scenario name
-case $SDN_CONTROLLER in
- odl_l2)
- SRCBUNDLE="ovs-odl"
- SDN_CONTROLLER="odl"
- ;;
- onos)
- SRCBUNDLE="onos"
- ;;
- ocl)
- SRCBUNDLE="contrail"
- SDN_CONTROLLER="opencontrail"
- ;;
- *)
- SRCBUNDLE="ovs"
- echo "${SDN_CONTROLLER} not in SDN controllers list, using 'nosdn' setting"
- SDN_CONTROLLER="nosdn"
- ;;
- esac
-SRCBUNDLE="${WORKSPACE}/ci/${SDN_CONTROLLER}/juju-deployer/${SRCBUNDLE}"
+if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then
+ SDN_CONTROLLER='odl'
+fi
if [ "$HA_MODE" == 'noha' ]; then
- SRCBUNDLE="${SRCBUNDLE}.yaml"
- HA_MODE == 'nonha'
-else
- SRCBUNDLE="${SRCBUNDLE}-${HA_MODE}.yaml"
+ HA_MODE='nonha'
fi
+SRCBUNDLE="${WORKSPACE}/ci/${SDN_CONTROLLER}/juju-deployer/"
+SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml"
+
# Modify files
@@ -217,6 +199,8 @@ else
--allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
--disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
exit_on_error $? "External subnet creation failed"
+ neutron net-update $EXTNET_NAME --shared
+ exit_on_error $? "External network sharing failed"
fi
##