From Yaniv Bronhaim <ybron...@redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: check-merged: phase 1 for making file more readable
......................................................................
check-merged: phase 1 for making file more readable
only comments removal and some lines separation for readability
Change-Id: I8f2ce1e98a7052ed8976c088559a295e9d067770
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M automation/check-merged.sh
1 file changed, 6 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/70648/1
diff --git a/automation/check-merged.sh b/automation/check-merged.sh
index 1f4da22..e385965 100755
--- a/automation/check-merged.sh
+++ b/automation/check-merged.sh
@@ -1,12 +1,17 @@
#!/bin/bash -ex
+
export LIBGUESTFS_BACKEND=direct
+
# ensure /dev/kvm exists, otherwise it will still use
# direct backend, but without KVM(much slower).
! [[ -c "/dev/kvm" ]] && mknod /dev/kvm c 10 232
+
+
DISTRO='el7'
AUTOMATION="$PWD"/automation
PREFIX="$AUTOMATION"/vdsm_functional
EXPORTS="$PWD"/exported-artifacts
+
# Creates RPMS
"$AUTOMATION"/build-artifacts.sh
@@ -23,17 +28,11 @@
[[ -e /usr/bin/qemu-kvm ]] \
|| ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm
-
lago init \
"$PREFIX" \
"$AUTOMATION"/lago-env.yml
-# If testing locally in the rh office you can use the option
-# --template-repo-path=http://10.35.18.63/repo/repo.metadata
cd "$PREFIX"
-
-# Make sure that there are no cached local repos, will not be needed once lago
-# can handle local rpms properly
lago ovirt reposetup \
--reposync-yum-config /dev/null \
--custom-source "dir:$EXPORTS"
@@ -84,11 +83,9 @@
}
mkdir "$EXPORTS"/lago-logs
-VMS_PREFIX="vdsm_functional_tests_host-"
failed=0
-vm_name="${VMS_PREFIX}${DISTRO}"
-# starting vms one by one to avoid exhausting memory in the host, it will
+vm_name="vdsm_functional_tests_host-${DISTRO}"
lago start "$vm_name"
prepare_and_copy_yum_conf "$vm_name"
--
To view, visit https://gerrit.ovirt.org/70648
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f2ce1e98a7052ed8976c088559a295e9d067770
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
