mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
Remove gluster support
Development on gluster has stopped upstream, see: https://marc.info/?l=fedora-devel-list&m=171934833215726&w=2
This commit is contained in:
@@ -642,7 +642,6 @@ TESTS += \
|
||||
regressions/rhbz1011907-1165785.sh \
|
||||
regressions/rhbz1174551.sh \
|
||||
regressions/rhbz1175196.sh \
|
||||
regressions/rhbz1370424.sh \
|
||||
regressions/rhbz1477623.sh \
|
||||
regressions/rhbz1930996.sh \
|
||||
regressions/test-big-heap \
|
||||
@@ -675,8 +674,6 @@ EXTRA_DIST += \
|
||||
regressions/rhbz1091803.sh \
|
||||
regressions/rhbz1174551.sh \
|
||||
regressions/rhbz1175196.sh \
|
||||
regressions/rhbz1370424.sh \
|
||||
regressions/rhbz1370424.xml \
|
||||
regressions/rhbz1477623.sh \
|
||||
regressions/rhbz1930996.sh \
|
||||
regressions/test-noexec-stack.pl
|
||||
|
||||
@@ -65,13 +65,6 @@ check_output
|
||||
grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail ceph2
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
# Gluster.
|
||||
|
||||
$guestfish -d gluster run ||:
|
||||
check_output
|
||||
grep -sq -- '-drive file=gluster://1.2.3.4:1234/volname/image,' "$DEBUG_QEMU_FILE" || fail gluster
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
# iSCSI.
|
||||
|
||||
$guestfish -d iscsi run ||:
|
||||
|
||||
@@ -59,25 +59,6 @@
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
<domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
|
||||
<test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
|
||||
<name>gluster</name>
|
||||
<memory>1048576</memory>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<devices>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu'/>
|
||||
<source protocol='gluster' name='volname/image'>
|
||||
<host name='1.2.3.4' port='1234'/>
|
||||
</source>
|
||||
<target dev='vda' bus='virtio'/>
|
||||
</disk>
|
||||
</devices>
|
||||
</domain>
|
||||
|
||||
<domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'>
|
||||
<test:runstate>5</test:runstate> <!-- 5 == VIR_DOMAIN_SHUTOFF -->
|
||||
<name>iscsi</name>
|
||||
|
||||
@@ -72,16 +72,6 @@ check_output
|
||||
grep -sq -- '-drive file=http://www.example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
# Gluster.
|
||||
|
||||
guestfish <<EOF ||:
|
||||
add "volname/image" "format:raw" "protocol:gluster" "server:www.example.com:24007"
|
||||
run
|
||||
EOF
|
||||
check_output
|
||||
grep -sq -- '-drive file=gluster://www.example.com:24007/volname/image,' "$DEBUG_QEMU_FILE" || fail
|
||||
rm "$DEBUG_QEMU_FILE"
|
||||
|
||||
# iSCSI.
|
||||
|
||||
guestfish <<EOF ||:
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
#!/bin/bash -
|
||||
# libguestfs
|
||||
# Copyright (C) 2016 Red Hat Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
# Regression test for:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1370424
|
||||
# Handle a network disk without a port attribute.
|
||||
|
||||
set -e
|
||||
|
||||
$TEST_FUNCTIONS
|
||||
skip_if_skipped
|
||||
|
||||
guestfish <<EOF
|
||||
-add-domain rhbz1370424 \
|
||||
libvirturi:test://$srcdir/regressions/rhbz1370424.xml \
|
||||
readonly:true
|
||||
# The test is just that the above command does not segfault.
|
||||
# We don't need to do anything else here.
|
||||
EOF
|
||||
@@ -1,28 +0,0 @@
|
||||
<node>
|
||||
<domain type='test'>
|
||||
<name>rhbz1370424</name>
|
||||
<memory>1048576</memory>
|
||||
<vcpu>2</vcpu>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<features>
|
||||
<acpi/>
|
||||
<apic/>
|
||||
<pae/>
|
||||
</features>
|
||||
<devices>
|
||||
<disk type='network' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source protocol='gluster' name='gluster-vol/test.qcow2'>
|
||||
<host name='localhost'/>
|
||||
</source>
|
||||
<backingStore/>
|
||||
<target dev='vda' bus='virtio'/>
|
||||
<alias name='virtio-disk0'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
||||
</disk>
|
||||
</devices>
|
||||
</domain>
|
||||
</node>
|
||||
Reference in New Issue
Block a user