From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: check-merged: adding virtTests
......................................................................
check-merged: adding virtTests
Change-Id: Ibdd67ff59beb20a13c187087e9cfa148ba705eb6
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M automation/check-merged.sh
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/70837/1
diff --git a/automation/check-merged.sh b/automation/check-merged.sh
index e6933b9..c913610 100755
--- a/automation/check-merged.sh
+++ b/automation/check-merged.sh
@@ -65,6 +65,20 @@
return $res
}
+function run_virt_tests {
+ local res=0
+ lago shell "$VM_NAME" -c \
+ " \
+ cd /usr/share/vdsm/tests
+ ./run_tests.sh \
+ --with-xunit \
+ --xunit-file=/tmp/nosetests-${DISTRO}.xml \
+ -s \
+ functional/virtTests.py \
+ " || res=$?
+ return $res
+}
+
function run_network_tests {
local res=0
lago shell "$VM_NAME" -c \
@@ -113,9 +127,13 @@
function run_all_tests {
run_infra_tests | tee "$EXPORTS/functional_tests_stdout.$DISTRO.log"
- failed="${PIPESTATUS[0]}"
+ local failed="${PIPESTATUS[0]}"
run_network_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log"
+ local res="${PIPESTATUS[0]}"
+ [ "$res" -ne 0 ] && failed="$res"
+
+ run_virt_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log"
res="${PIPESTATUS[0]}"
[ "$res" -ne 0 ] && failed="$res"
}
--
To view, visit
https://gerrit.ovirt.org/70837
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdd67ff59beb20a13c187087e9cfa148ba705eb6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>