summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2015-12-18 15:45:12 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-18 15:03:32 +0000
commit16a999c8ae7b36d471e5e632be3f5cbed66a5f98 (patch)
tree71da4ef03d83792c780ce9eeff5c853fdb4099f3
parentf83ccfb8ebf8d22e08611addf87bc2f4cba7462a (diff)
Add JOID project parameters and a final openstack test to check deploy result
Change-Id: I1d14832cac2867ca9d9b64608bfe3231c316f2d5 Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--jjb/joid/joid-deploy.sh43
-rw-r--r--jjb/opnfv/installer-params.yml8
2 files changed, 40 insertions, 11 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index b7bc32df2..c7e5ba8fd 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -5,12 +5,6 @@ set -o nounset
JOID_LOCAL_CONFIG_FOLDER=$HOME/joid_config
JOID_ADMIN_OPENRC=$JOID_LOCAL_CONFIG_FOLDER/admin-openrc
-####### Temporary - to be done with jenkins params #####
-JOID_MODE=ha
-JOID_RELEASE=liberty
-JOID_SDN_CONTROLLER=odl
-#################
-
##
## Load local config or defaults
##
@@ -20,6 +14,7 @@ if [ -e "$JOID_LOCAL_CONFIG_FOLDER/config.sh" ]; then
source $JOID_LOCAL_CONFIG_FOLDER/config.sh
else
echo "------ No local config, load default ------"
+ # link NODE_NAME to joid node config names
case $NODE_NAME in
orange-fr-pod2)
POD=orange-pod2 ;;
@@ -59,10 +54,10 @@ fi
##
# Get juju deployer file
-if [ "$JOID_MODE" == 'nonha' ]; then
- SRCBUNDLE=$WORKSPACE/ci/$JOID_SDN_CONTROLLER/juju-deployer/ovs-$JOID_SDN_CONTROLLER.yaml
+if [ "$HA_MODE" == 'nonha' ]; then
+ SRCBUNDLE=$WORKSPACE/ci/$SDN_CONTROLLER/juju-deployer/ovs-$SDN_CONTROLLER.yaml
else
- SRCBUNDLE=$WORKSPACE/ci/$JOID_SDN_CONTROLLER/juju-deployer/ovs-$JOID_SDN_CONTROLLER-$JOID_MODE.yaml
+ SRCBUNDLE=$WORKSPACE/ci/$SDN_CONTROLLER/juju-deployer/ovs-$SDN_CONTROLLER-$HA_MODE.yaml
fi
# Modify files
@@ -79,9 +74,9 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
##
echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $JOID_MODE -o $JOID_RELEASE -s $JOID_SDN_CONTROLLER -l $POD_NAME"
+echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME"
-./deploy.sh -t $JOID_MODE -o $JOID_RELEASE -s $JOID_SDN_CONTROLLER -l $POD_NAME
+./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME
##
## Set Admin RC
@@ -113,3 +108,29 @@ if [ -d "$JOID_LOCAL_CONFIG_FOLDER" ]; then
echo "------ Backup Juju environment ------"
cp environments.yaml $JOID_LOCAL_CONFIG_FOLDER/
fi
+
+##
+## Basic test to return a realistic result to jenkins
+##
+source $JOID_ADMIN_OPENRC
+curl -i -sw '%{http_code}' -H "Content-Type: application/json" -d "
+{ \"auth\": {
+ \"identity\": {
+ \"methods\": [\"password\"],
+ \"password\": {
+ \"user\": {
+ \"name\": \"$OS_TENANT_NAME\",
+ \"domain\": { \"id\": \"default\" },
+ \"password\": \"$OS_PASSWORD\"
+ }
+ }
+ }
+ }
+}" http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null; echo $?;
+RES=$?
+if [ $RES == 0 ]; then
+ echo "Deploy SUCCESS"
+else
+ echo "Deploy FAILED"
+fi
+exit $RES
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 72c1c71a3..1bd1ce737 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -77,3 +77,11 @@
name: OPNFV_FEATURE
default: 'none'
description: 'OPNFV Feature to activate'
+ - string:
+ name: HA_MODE
+ default: 'ha'
+ description: 'High Availability mode (ha|nonha)'
+ - string:
+ name: OS_RELEASE
+ default: 'liberty'
+ description: 'OpenStack release (kilo|liberty)'