Merge pull request #587 from imikushin/fix-135

installer: copy 1M zeroes to the target device before running fdisk

scripts/installer/set-disk-partitions

@@ -28,11 +28,11 @@ if [ "$PARTITION_COUNT" -gt "1" ]; then
             exit 1
         fi
     done
-
-    dd if=/dev/zero of=${DEVICE} bs=512 count=1
-    partprobe ${DEVICE}
 fi
 
+dd if=/dev/zero of=${DEVICE} bs=512 count=2048
+partprobe ${DEVICE}
+
 fdisk ${DEVICE} <<EOF
 n
 p

tests/integration/rancherostest/test_03_docker_in_persistent_console.py

@@ -1,7 +1,6 @@
 import pytest
 import rancherostest.util as u
 import subprocess
-import yaml
 
 
 ssh_command = ['./scripts/ssh', '--qemu', '--key', './tests/integration/assets/test.key']
@@ -13,11 +12,6 @@ def qemu(request):
     return u.run_qemu(request, ['--cloud-config', cloud_config_path])
 
 
-@pytest.fixture(scope="module")
-def cloud_config():
-    return yaml.load(open(cloud_config_path))
-
-
 @pytest.mark.timeout(40)
 def test_reboot_with_container_running(qemu):
     assert qemu is not None

tests/integration/rancherostest/test_04_ros_install.py

@@ -0,0 +1,28 @@
+import pytest
+import rancherostest.util as u
+import subprocess
+
+
+ssh_command = ['./scripts/ssh', '--qemu']
+
+
+@pytest.fixture(scope="module")
+def qemu(request):
+    return u.run_qemu(request, ['--no-format'])
+
+
+@pytest.mark.timeout(40)
+def test_ros_install_on_formatted_disk(qemu):
+    assert qemu is not None
+    u.wait_for_ssh(ssh_command)
+    subprocess.check_call(ssh_command + ['sudo', 'mkfs.ext4', '/dev/vda'],
+                          stderr=subprocess.STDOUT, universal_newlines=True)
+
+    subprocess.check_call(ssh_command + ['sudo', 'ros', 'install', '-f', '--no-reboot', '-d', '/dev/vda',
+                                         '-i', 'rancher/os:v0.4.0-dev-test.135'],
+                          stderr=subprocess.STDOUT, universal_newlines=True)
+
+    subprocess.call(ssh_command + ['sudo', 'reboot'],
+                    stderr=subprocess.STDOUT, universal_newlines=True)
+
+    u.wait_for_ssh(ssh_command)