RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27614 from smithfarm/wip-39323

Browse Source 
tests: mgr/tox: make run-tox.sh scripts more robust

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Nathan Cutler 2019-04-30 10:13:00 +02:00 committed by GitHub
commit 8bce53fa72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pybind/mgr/ansible/run-tox.sh
View File

@ -1,9 +1,16 @@
#!/usr/bin/env bash
function dump_envvars {
echo "WITH_PYTHON2: ->$WITH_PYTHON2<-"
echo "WITH_PYTHON3: ->$WITH_PYTHON3<-"
echo "TOX_PATH: ->$TOX_PATH<-"
echo "ENV_LIST: ->$ENV_LIST<-"
}
# run from ./ or from ../
: ${MGR_ANSIBLE_VIRTUALENV:=$CEPH_BUILD_DIR/mgr-ansible-virtualenv}
: ${WITH_PYTHON2:=ON}
: ${WITH_PYTHON3:=ON}
: ${WITH_PYTHON3:=3}
: ${CEPH_BUILD_DIR:=$PWD/.tox}
test -d ansible && cd ansible
@ -20,10 +27,15 @@ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
source ${MGR_ANSIBLE_VIRTUALENV}/bin/activate
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
ENV_LIST+="py27,"
fi
if [ "$WITH_PYTHON3" = "ON" ]; then
ENV_LIST+="py3"
if [ "$WITH_PYTHON3" = "3" ]; then
ENV_LIST+="py3,"
fi
# use bash string manipulation to strip off any trailing comma
ENV_LIST=${ENV_LIST%,}
tox -c ${TOX_PATH} -e ${ENV_LIST}
tox -c "${TOX_PATH}" -e "${ENV_LIST}"
TOX_STATUS="$?"
test "$TOX_STATUS" -ne "0" && dump_envvars
exit $TOX_STATUS

24
src/pybind/mgr/dashboard/run-tox.sh
View File

@ -1,16 +1,23 @@
#!/usr/bin/env bash
function dump_envvars {
echo "WITH_PYTHON2: ->$WITH_PYTHON2<-"
echo "WITH_PYTHON3: ->$WITH_PYTHON3<-"
echo "TOX_PATH: ->$TOX_PATH<-"
echo "ENV_LIST: ->$ENV_LIST<-"
}
# run from ./ or from ../
: ${CEPH_BUILD_DIR:=$PWD/.tox}
: ${MGR_DASHBOARD_VIRTUALENV:=$CEPH_BUILD_DIR/mgr-dashboard-virtualenv}
: ${WITH_PYTHON2:=ON}
: ${WITH_PYTHON3:=ON}
: ${WITH_PYTHON3:=3}
test -d dashboard && cd dashboard
if [ -e tox.ini ]; then
TOX_PATH=`readlink -f tox.ini`
TOX_PATH=$(readlink -f tox.ini)
else
TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
fi
# tox.ini will take care of this.
@ -26,12 +33,17 @@ if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27-cov,py27-lint,"
fi
fi
if [ "$WITH_PYTHON3" = "ON" ]; then
if [ "$WITH_PYTHON3" = "3" ]; then
if [[ -n "$@" ]]; then
ENV_LIST+="py3-run"
ENV_LIST+="py3-run,"
else
ENV_LIST+="py3-cov,py3-lint"
fi
fi
# use bash string manipulation to strip off any trailing comma
ENV_LIST=${ENV_LIST%,}
tox -c ${TOX_PATH} -e "$ENV_LIST" "$@"
tox -c "${TOX_PATH}" -e "${ENV_LIST}"
TOX_STATUS="$?"
test "$TOX_STATUS" -ne "0" && dump_envvars
exit $TOX_STATUS

26
src/pybind/mgr/insights/run-tox.sh
View File

@ -1,16 +1,23 @@
#!/usr/bin/env bash
function dump_envvars {
echo "WITH_PYTHON2: ->$WITH_PYTHON2<-"
echo "WITH_PYTHON3: ->$WITH_PYTHON3<-"
echo "TOX_PATH: ->$TOX_PATH<-"
echo "ENV_LIST: ->$ENV_LIST<-"
}
# run from ./ or from ../
: ${MGR_INSIGHTS_VIRTUALENV:=$CEPH_BUILD_DIR/mgr-insights-virtualenv}
: ${WITH_PYTHON2:=ON}
: ${WITH_PYTHON3:=ON}
: ${WITH_PYTHON3:=3}
: ${CEPH_BUILD_DIR:=$PWD/.tox}
test -d insights && cd insights
if [ -e tox.ini ]; then
TOX_PATH=`readlink -f tox.ini`
TOX_PATH=$(readlink -f tox.ini)
else
TOX_PATH=`readlink -f $(dirname $0)/tox.ini`
TOX_PATH=$(readlink -f $(dirname $0)/tox.ini)
fi
# tox.ini will take care of this.
@ -20,10 +27,15 @@ export CEPH_BUILD_DIR=$CEPH_BUILD_DIR
source ${MGR_INSIGHTS_VIRTUALENV}/bin/activate
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
ENV_LIST+="py27,"
fi
if [ "$WITH_PYTHON3" = "ON" ]; then
ENV_LIST+="py3"
if [ "$WITH_PYTHON3" = "3" ]; then
ENV_LIST+="py3,"
fi
# use bash string manipulation to strip off any trailing comma
ENV_LIST=${ENV_LIST%,}
tox -c ${TOX_PATH} -e ${ENV_LIST}
tox -c "${TOX_PATH}" -e "${ENV_LIST}"
TOX_STATUS="$?"
test "$TOX_STATUS" -ne "0" && dump_envvars
exit $TOX_STATUS

24
src/pybind/mgr/orchestrator_cli/run-tox.sh
View File

@ -1,9 +1,16 @@
#!/usr/bin/env bash
function dump_envvars {
echo "WITH_PYTHON2: ->$WITH_PYTHON2<-"
echo "WITH_PYTHON3: ->$WITH_PYTHON3<-"
echo "TOX_PATH: ->$TOX_PATH<-"
echo "ENV_LIST: ->$ENV_LIST<-"
}
# run from ./ or from ../
: ${MGR_ORCHESTRATOR_CLI_VIRTUALENV:=$CEPH_BUILD_DIR/mgr-orchestrator_cli-virtualenv}
: ${WITH_PYTHON2:=ON}
: ${WITH_PYTHON3:=ON}
: ${WITH_PYTHON3:=3}
: ${CEPH_BUILD_DIR:=$PWD/.tox}
test -d orchestrator_cli && cd orchestrator_cli
@ -23,10 +30,17 @@ then
fi
if [ "$WITH_PYTHON2" = "ON" ]; then
ENV_LIST+="py27"
ENV_LIST+="py27,"
fi
if [ "$WITH_PYTHON3" = "ON" ]; then
ENV_LIST+=",py3"
if [ "$WITH_PYTHON3" = "3" ]; then
ENV_LIST+="py3,"
fi
ENV_LIST=$(echo "$ENV_LIST" | sed -e 's/,$//')
tox -c ${TOX_PATH} -e ${ENV_LIST}
# use bash string manipulation to strip off any trailing comma
ENV_LIST=${ENV_LIST%,}
tox -c "${TOX_PATH}" -e "${ENV_LIST}"
TOX_STATUS="$?"
test "$TOX_STATUS" -ne "0" && dump_envvars
exit $TOX_STATUS