From Yaniv Bronhaim <[email protected]>: Yaniv Bronhaim has uploaded a new change for review.
Change subject: check_merged: placing logic in functions ...................................................................... check_merged: placing logic in functions trying to keep the small changes - this patch only wrap some global parts into prepare and run functions. Change-Id: I97c8971c8c756847fe7c8459a452e724144af580 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M automation/check-merged.sh 1 file changed, 51 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/70774/1 diff --git a/automation/check-merged.sh b/automation/check-merged.sh index 964a66f..9ea0143 100755 --- a/automation/check-merged.sh +++ b/automation/check-merged.sh @@ -12,30 +12,31 @@ PREFIX="$AUTOMATION"/vdsm_functional EXPORTS="$PWD"/exported-artifacts +function prepare { + # Creates RPMS + "$AUTOMATION"/build-artifacts.sh -# Creates RPMS -"$AUTOMATION"/build-artifacts.sh + if [[ -d "$PREFIX" ]]; then + pushd "$PREFIX" + echo 'cleaning old lago env' + lago cleanup || : + popd + rm -rf "$PREFIX" + fi -if [[ -d "$PREFIX" ]]; then - pushd "$PREFIX" - echo 'cleaning old lago env' - lago cleanup || : - popd - rm -rf "$PREFIX" -fi + # Fix when running in an el* chroot in fc2* host + [[ -e /usr/bin/qemu-kvm ]] \ + || ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm -# Fix when running in an el* chroot in fc2* host -[[ -e /usr/bin/qemu-kvm ]] \ -|| ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm + lago init \ + "$PREFIX" \ + "$AUTOMATION"/lago-env.yml -lago init \ - "$PREFIX" \ - "$AUTOMATION"/lago-env.yml - -cd "$PREFIX" -lago ovirt reposetup \ - --reposync-yum-config /dev/null \ - --custom-source "dir:$EXPORTS" + cd "$PREFIX" + lago ovirt reposetup \ + --reposync-yum-config /dev/null \ + --custom-source "dir:$EXPORTS" +} function fake_ksm_in_vm { lago shell "$vm_name" -c "mount -t tmpfs tmpfs /sys/kernel/mm/ksm" @@ -82,41 +83,45 @@ rm "$tempfile" } -mkdir "$EXPORTS"/lago-logs -failed=0 +function run { + mkdir "$EXPORTS"/lago-logs + failed=0 -vm_name="vdsm_functional_tests_host-${DISTRO}" -lago start "$vm_name" + vm_name="vdsm_functional_tests_host-${DISTRO}" + lago start "$vm_name" -prepare_and_copy_yum_conf "$vm_name" + prepare_and_copy_yum_conf "$vm_name" -# the ovirt deploy is needed because it will not start the local repo -# otherwise -lago ovirt deploy + # the ovirt deploy is needed because it will not start the local repo + # otherwise + lago ovirt deploy -lago ovirt serve & -PID=$! + lago ovirt serve & + PID=$! -fake_kvm_in_vm + fake_kvm_in_vm -run_infra_tests | tee "$EXPORTS/functional_tests_stdout.$DISTRO.log" -failed="${PIPESTATUS[0]}" + run_infra_tests | tee "$EXPORTS/functional_tests_stdout.$DISTRO.log" + failed="${PIPESTATUS[0]}" -run_network_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log" -res="${PIPESTATUS[0]}" -[ "$res" -ne 0 ] && failed="$res" + run_network_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log" + res="${PIPESTATUS[0]}" + [ "$res" -ne 0 ] && failed="$res" -kill $PID + kill $PID -lago copy-from-vm \ -"$vm_name" \ -"/tmp/nosetests-${DISTRO}.xml" \ -"$EXPORTS/nosetests-${DISTRO}.xml" || : -lago collect --output "$EXPORTS"/lago-logs -lago stop "$vm_name" + lago copy-from-vm \ + "$vm_name" \ + "/tmp/nosetests-${DISTRO}.xml" \ + "$EXPORTS/nosetests-${DISTRO}.xml" || : + lago collect --output "$EXPORTS"/lago-logs -lago cleanup + lago stop "$vm_name" + lago cleanup -cp "$PREFIX"/current/logs/*.log "$EXPORTS"/lago-logs + cp "$PREFIX"/current/logs/*.log "$EXPORTS"/lago-logs + return $failed +} -exit $failed +prepare && run +exit $? -- To view, visit https://gerrit.ovirt.org/70774 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97c8971c8c756847fe7c8459a452e724144af580 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
