From Yaniv Bronhaim <ybron...@redhat.com>: Yaniv Bronhaim has posted comments on this change.
Change subject: check-merged: adding cleanup and globelize VM_NAME ...................................................................... Patch Set 1: Verified+1 (7 comments) https://gerrit.ovirt.org/#/c/70816/1/automation/check-merged.sh File automation/check-merged.sh: Line 12: AUTOMATION="$PWD"/automation Line 13: PREFIX="$AUTOMATION"/vdsm_functional Line 14: EXPORTS="$PWD"/exported-artifacts Line 15: Line 16: function prepare { call it setup_env Line 17: # Creates RPMS Line 18: "$AUTOMATION"/build-artifacts.sh Line 19: Line 20: if [[ -d "$PREFIX" ]]; then Line 22: echo 'cleaning old lago env' Line 23: lago cleanup || : Line 24: popd Line 25: rm -rf "$PREFIX" Line 26: fi remove and check if ok - should be part of jenkins not our script Line 27: Line 28: # Fix when running in an el* chroot in fc2* host Line 29: [[ -e /usr/bin/qemu-kvm ]] \ Line 30: || ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm Line 26: fi Line 27: Line 28: # Fix when running in an el* chroot in fc2* host Line 29: [[ -e /usr/bin/qemu-kvm ]] \ Line 30: || ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm move out -> put it next to the kvm tweak Line 31: Line 32: lago init \ Line 33: "$PREFIX" \ Line 34: "$AUTOMATION"/lago-env.yml Line 34: "$AUTOMATION"/lago-env.yml Line 35: Line 36: cd "$PREFIX" Line 37: lago ovirt reposetup \ Line 38: --reposync-yum-config /dev/null \ this can be removed - also fixed in lago Line 39: --custom-source "dir:$EXPORTS" Line 40: } Line 41: Line 42: function fake_ksm_in_vm { Line 95: # otherwise Line 96: lago ovirt deploy Line 97: Line 98: lago ovirt serve & Line 99: PID=$! check if can be avoided change to httpd_pid Line 100: Line 101: fake_ksm_in_vm Line 102: Line 103: run_infra_tests | tee "$EXPORTS/functional_tests_stdout.$DISTRO.log" Line 104: failed="${PIPESTATUS[0]}" Line 105: Line 106: run_network_tests | tee -a "$EXPORTS/functional_tests_stdout.$DISTRO.log" Line 107: res="${PIPESTATUS[0]}" Line 108: [ "$res" -ne 0 ] && failed="$res" run_all_tests? Line 109: Line 110: kill $PID Line 111: Line 112: lago copy-from-vm \ Line 114: "/tmp/nosetests-${DISTRO}.xml" \ Line 115: "$EXPORTS/nosetests-${DISTRO}.xml" || : Line 116: lago collect --output "$EXPORTS"/lago-logs Line 117: Line 118: cp "$PREFIX"/current/logs/*.log "$EXPORTS"/lago-logs collect logs func? Line 119: return $failed Line 120: } Line 121: Line 122: function cleanup { -- To view, visit https://gerrit.ovirt.org/70816 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I24105365b97cfc41d3cd44b1c1da8fb5d0d09ed1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Irit Goihman <igoih...@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczew...@gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybron...@redhat.com> Gerrit-Reviewer: gerrit-hooks <automat...@ovirt.org> Gerrit-HasComments: Yes _______________________________________________ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
