diff --git a/test/images/volumes-tester/iscsi/Dockerfile b/test/images/volumes-tester/iscsi/Dockerfile index ff3ab35fb7f..26eccb59d58 100644 --- a/test/images/volumes-tester/iscsi/Dockerfile +++ b/test/images/volumes-tester/iscsi/Dockerfile @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM fedora -RUN yum install -y iscsi-initiator-utils targetcli net-tools strace && yum clean all +FROM fedora:26 + +RUN yum install -y iscsi-initiator-utils targetcli net-tools strace procps-ng psmisc && yum clean all ADD run_iscsid.sh /usr/local/bin/ ADD initiatorname.iscsi /etc/iscsi/ ADD block.tar.gz / diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile index 85b6d6b0e9e..d5b295fd7fe 100644 --- a/test/images/volumes-tester/iscsi/Makefile +++ b/test/images/volumes-tester/iscsi/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -TAG = 0.1 +TAG = 0.2 PREFIX = staging-k8s.gcr.io all: push diff --git a/test/images/volumes-tester/iscsi/block.tar.gz b/test/images/volumes-tester/iscsi/block.tar.gz index 8576d132c8d..8840f543869 100644 Binary files a/test/images/volumes-tester/iscsi/block.tar.gz and b/test/images/volumes-tester/iscsi/block.tar.gz differ diff --git a/test/images/volumes-tester/iscsi/create_block.sh b/test/images/volumes-tester/iscsi/create_block.sh index 0fe90f71674..2fbc61faca2 100755 --- a/test/images/volumes-tester/iscsi/create_block.sh +++ b/test/images/volumes-tester/iscsi/create_block.sh @@ -33,8 +33,9 @@ cleanup() trap cleanup TERM EXIT -# Create 1MB device with ext2 -dd if=/dev/zero of=block count=1 bs=1M +# Create 120MB device with ext2 +# (volume_io tests need at least 100MB) +dd if=/dev/zero of=block seek=120 count=1 bs=1M mkfs.ext2 block # Add index.html to it diff --git a/test/images/volumes-tester/iscsi/run_iscsid.sh b/test/images/volumes-tester/iscsi/run_iscsid.sh index 767f48d077f..2720287745a 100755 --- a/test/images/volumes-tester/iscsi/run_iscsid.sh +++ b/test/images/volumes-tester/iscsi/run_iscsid.sh @@ -16,16 +16,26 @@ function start() { + # targetcli need dbus + mkdir /run/dbus + dbus-daemon --system + + # clear any previous configuration + targetcli clearconfig confirm=True + + # restore configuration from saveconfig.json targetcli restoreconfig - iscsid + + # maximum log level + iscsid -f -d 8 + echo "iscsid started" } function stop() { echo "Stopping iscsid" - - kill $( cat /var/run/iscsid.pid ) + killall iscsid targetcli clearconfig confirm=True echo "iscsid stopped" diff --git a/test/images/volumes-tester/iscsi/saveconfig.json b/test/images/volumes-tester/iscsi/saveconfig.json index 7520b99e538..4efc14c8a27 100644 --- a/test/images/volumes-tester/iscsi/saveconfig.json +++ b/test/images/volumes-tester/iscsi/saveconfig.json @@ -32,7 +32,7 @@ "dev": "block", "name": "block", "plugin": "fileio", - "size": 1048576, + "size": 126877696, "write_back": true, "wwn": "521c57aa-9d9b-4e5d-ab1a-527487f92a33" } diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 85b0e5fd5df..dae027c3269 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -94,7 +94,7 @@ var ( ServeHostname = ImageConfig{e2eRegistry, "serve-hostname", "1.0", true} TestWebserver = ImageConfig{e2eRegistry, "test-webserver", "1.0", true} VolumeNFSServer = ImageConfig{gcRegistry, "volume-nfs", "0.8", false} - VolumeISCSIServer = ImageConfig{gcRegistry, "volume-icsci", "0.1", false} + VolumeISCSIServer = ImageConfig{gcRegistry, "volume-iscsi", "0.2", false} VolumeGlusterServer = ImageConfig{gcRegistry, "volume-gluster", "0.2", false} VolumeCephServer = ImageConfig{gcRegistry, "volume-ceph", "0.1", false} VolumeRBDServer = ImageConfig{gcRegistry, "volume-rbd", "0.1", false}