Update integration test

Author: schaefi

build-tests/x86/tumbleweed/test-image-disk/appliance.kiwi

@@ -36,23 +36,22 @@
         </type>
     </preferences>
     <preferences profiles="Retain">
-        <type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 rd.kiwi.install.retain_last" firmware="efi" installiso="true" bootpartition="false" btrfs_root_is_snapshot="true" installboot="install" spare_part="0" spare_part_is_last="true">
+        <type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 rd.kiwi.install.retain_last" firmware="efi" installiso="true" bootpartition="false" btrfs_root_is_snapshot="true" installboot="install" spare_part="0" spare_part_fs="ext4" spare_part_mountpoint="/home" spare_part_is_last="true">
             <bootloader name="grub2" console="serial" timeout="10"/>
             <oemconfig>
                 <oem-unattended>true</oem-unattended>
                 <oem-swap>true</oem-swap>
-                <oem-swapsize>1024</oem-swapsize>
-                <!-- set root partition to fixed 2048MB -->
+                <oem-swapsize>512</oem-swapsize>
+                <!-- set root partition to a fixed value to keep address consistent -->
                 <oem-systemsize>2048</oem-systemsize>
                 <oem-multipath-scan>false</oem-multipath-scan>
-                <!-- data part (spare) is last, no auto resize from us -->
-                <oem-resize>false</oem-resize>
+                <oem-resize>true</oem-resize>
             </oemconfig>
             <systemdisk>
-                <volume name="home"/>
+                <volume name="root"/>
             </systemdisk>
             <!-- whole disk must be big enough for fixed root + other -->
-            <size unit="M">3100</size>
+            <size unit="G">3</size>
         </type>
     </preferences>
     <users>

build-tests/x86/tumbleweed/test-image-disk/config.sh

@@ -1,9 +1,22 @@
 #!/bin/bash
 set -ex
 
+declare kiwi_profiles=${kiwi_profiles}
+
 #======================================
 # Activate services
 #--------------------------------------
 systemctl enable sshd
 systemctl enable grub_config
 systemctl enable dracut_hostonly
+
+# Just in case the kiwi resizer is disabled in the system and
+# gets dropped from the initrd by the customer for some reason
+for profile in ${kiwi_profiles//,/ }; do
+    if [ "${profile}" = "Retain" ]; then
+        cat > /etc/fstab.script <<-EOF
+		sed -ie "s@/home ext4 defaults@/home ext4 x-systemd.growfs,defaults@" /etc/fstab
+        rm /etc/fstabe
+		EOF
+    fi
+done