Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fix some bugs for python verify jobs:"
[doctor.git]
/
tests
/
run.sh
diff --git
a/tests/run.sh
b/tests/run.sh
index
daf2394
..
5c92226
100755
(executable)
--- a/
tests/run.sh
+++ b/
tests/run.sh
@@
-48,7
+48,7
@@
as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT
get_compute_host_info() {
# get computer host info which first VM boot in as admin user
COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 |
get_compute_host_info() {
# get computer host info which first VM boot in as admin user
COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 |
- grep "OS-EXT-SRV-ATTR:host" | awk '{ print $4 }')
+ grep "OS-EXT-SRV-ATTR:host
" | awk '{ print $4 }')
compute_host_in_undercloud=${COMPUTE_HOST%%.*}
die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname"
compute_host_in_undercloud=${COMPUTE_HOST%%.*}
die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname"
@@
-294,8
+294,7
@@
inject_failure() {
echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
cat > disable_network.sh << 'END_TXT'
#!/bin/bash -x
echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
cat > disable_network.sh << 'END_TXT'
#!/bin/bash -x
-dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $7}')
-[[ -n "$dev" ]] || dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $5}')
+dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $NF}')
sleep 1
sudo ip link set $dev down
echo "doctor set link down at" $(date "+%s.%N")
sleep 1
sudo ip link set $dev down
echo "doctor set link down at" $(date "+%s.%N")
@@
-481,7
+480,14
@@
cleanup() {
# Main process
# Main process
-if $PYTHON_ENABLE; then
+if [[ $PYTHON_ENABLE == [Tt]rue ]]; then
+ which tox || sudo pip install tox
+ if [ -f /usr/bin/apt-get ]; then
+ sudo apt-get install -y python3-dev
+ elif [ -f /usr/bin/yum ] ; then
+ sudo yum install -y python3-devel
+ fi
+
cd $TOP_DIR
echo "executing tox..."
tox
cd $TOP_DIR
echo "executing tox..."
tox