Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add verification for full distribution
[releng/builder.git]
/
jjb
/
integration
/
integration-deploy-openstack-run-test.sh
diff --git
a/jjb/integration/integration-deploy-openstack-run-test.sh
b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6a0e9463b27b86896206a96c6ab23ef82f3e7709..2862d190e254c1db4e32510179b953f082d33855 100644
(file)
--- a/
jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/
jjb/integration/integration-deploy-openstack-run-test.sh
@@
-4,6
+4,8
@@
# script.
# shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
source ${ROBOT_VENV}/bin/activate
# script.
# shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
+
PYTHON="${ROBOT_VENV}/bin/python"
SSH="ssh -t -t"
ADMIN_PASSWORD="admin"
PYTHON="${ROBOT_VENV}/bin/python"
SSH="ssh -t -t"
ADMIN_PASSWORD="admin"
@@
-111,7
+113,9
@@
function create_etc_hosts() {
# openstack release
function install_openstack_clients_in_robot_vm() {
packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
# openstack release
function install_openstack_clients_in_robot_vm() {
packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
- for plugin_name in ${ENABLE_OS_PLUGINS}; do
+ local os_plugins
+ os_plugins=$(csv2ssv "${ENABLE_OS_PLUGINS}")
+ for plugin_name in $os_plugins; do
if [ "$plugin_name" == "networking-sfc" ]; then
packages+=("networking-sfc")
fi
if [ "$plugin_name" == "networking-sfc" ]; then
packages+=("networking-sfc")
fi
@@
-136,16
+140,6
@@
function install_openstack_clients_in_robot_vm() {
fi
}
fi
}
-# convert commas in csv strings to spaces (ssv)
-function csv2ssv() {
- local csv=$1
- if [ -n "${csv}" ]; then
- ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g')
- fi
-
- echo "${ssv}"
-} # csv2ssv
-
function is_openstack_feature_enabled() {
local feature=$1
for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})
function is_openstack_feature_enabled() {
local feature=$1
for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})
@@
-798,9
+792,6
@@
EOF
mkdir -p ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
mkdir -p ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
- if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then
- mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
- fi
else
echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
fi
else
echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
fi