Resize partitions and make home encryption

lemon-suse · lemon-suse · commit 23bec324ffe5 · 2025-06-09T21:22:36.000-04:00
diff --git a/data/yam/agama/auto/lib/storage.libsonnet b/data/yam/agama/auto/lib/storage.libsonnet
@@ -10,6 +10,32 @@ local root_filesystem(filesystem) = {
   ],
 };
 
+local resize_vda() = {
+  drives: [
+    {
+      search: '/dev/vda',
+      partitions: [
+        {
+          search: '/dev/vda2',
+          filesystem: { path: '/' },
+          size: '12.5 GiB',
+        },
+        {
+          search: '/dev/vda3',
+          filesystem: { path: 'swap' },
+          size: '1 GiB'
+        },
+        {
+          filesystem: { path: '/home' },
+          encryption: {
+            luks2: { password: 'nots3cr3t' }
+          }
+        },
+      ],
+    },
+  ],
+};
+
 local lvm(encrypted=false, encryption='luks2') = {
   drives: [
     {
@@ -162,6 +188,7 @@ local raid(level='raid0', uefi=false) = {
   lvm_tpm_fde: lvm(true, 'tpmFde'),
   raid0: raid('raid0'),
   raid0_uefi: raid('raid0', true),
+  resize_fixed_vda: resize_vda(),
   root_filesystem_ext4: root_filesystem('ext4'),
   root_filesystem_xfs: root_filesystem('xfs'),
   whole_disk_and_boot_unattended: whole_disk_and_boot_unattended(),
diff --git a/data/yam/agama/auto/template.libsonnet b/data/yam/agama/auto/template.libsonnet
@@ -48,6 +48,7 @@ function(bootloader=false,
   [if storage == 'lvm_tpm_fde' then 'storage']: storage_lib['lvm_tpm_fde'],
   [if storage == 'root_filesystem_ext4' then 'storage']: storage_lib['root_filesystem_ext4'],
   [if storage == 'root_filesystem_xfs' then 'storage']: storage_lib['root_filesystem_xfs'],
+  [if storage == 'resize_vda' then 'storage']: storage_lib['resize_fixed_vda'],
   [if storage == 'whole_disk_and_boot_unattended' then 'storage']: storage_lib['whole_disk_and_boot_unattended'],
   [if user == true then 'user']: base_lib['user'],
 }
diff --git a/lib/Distribution/Opensuse/AgamaDevel.pm b/lib/Distribution/Opensuse/AgamaDevel.pm
@@ -21,6 +21,7 @@ use Yam::Agama::Pom::RebootPage;
 use Yam::Agama::Pom::EnterPassphraseBasePage;
 use Yam::Agama::Pom::EnterPassphraseForRootPage;
 use Yam::Agama::Pom::EnterPassphraseForSwapPage;
+use Yam::Agama::Pom::EnterPassphraseForHomePage;
 
 use Utils::Architectures;
 
@@ -68,4 +69,10 @@ sub get_enter_passphrase_for_swap {
     });
 }
 
+sub get_enter_passphrase_for_home {
+    return Yam::Agama::Pom::EnterPassphraseForHomePage->new({
+            enter_passphrase_base => Yam::Agama::Pom::EnterPassphraseBasePage->new()
+    });
+}
+
 1;
diff --git a/lib/Yam/Agama/Pom/EnterPassphraseForHomePage.pm b/lib/Yam/Agama/Pom/EnterPassphraseForHomePage.pm
@@ -0,0 +1,29 @@
+# SUSE's openQA tests
+#
+# Copyright 2025 SUSE LLC
+# SPDX-License-Identifier: FSFAP
+
+# Summary: Handles entering passphrase for home encryption after grub.
+# Maintainer: QE YaST and Migration (QE Yam) <qe-yam at suse de>
+
+package Yam::Agama::Pom::EnterPassphraseForHomePage;
+use strict;
+use warnings;
+use testapi;
+
+sub new {
+    my ($class, $args) = @_;
+    return bless {
+        enter_passphrase_base => $args->{enter_passphrase_base},
+        tag_enter_passphrase_for_home_partition => 'enter-passphrase-for-home-partition',
+    }, $class;
+}
+
+sub expect_is_shown {
+    my ($self) = @_;
+    assert_screen($self->{tag_enter_passphrase_for_home_partition}, 60);
+}
+
+sub enter { shift->{enter_passphrase_base}->enter() }
+
+1;
diff --git a/lib/filesystem_utils.pm b/lib/filesystem_utils.pm
@@ -476,10 +476,12 @@ sub validate_lsblk {
     my $dev = $args{device};
     my $type = $args{type};
     my $has_mountpoints_col = $args{has_mountpoints_col};
+    my $size = $args{size};
 
     my $validation_test_data = create_lsblk_validation_test_data(
         device => $dev,
-        has_mountpoints_col => $has_mountpoints_col);
+        has_mountpoints_col => $has_mountpoints_col,
+        size => $size);
 
     my $blockdev = lsblk_command(
         output => join(',', (keys %{$validation_test_data}, 'type')),
diff --git a/schedule/yam/agama_encrypted_unattended.yaml b/schedule/yam/agama_encrypted_unattended.yaml
@@ -0,0 +1,16 @@
+---
+name: Agama unattended with encryption
+description: >
+  Perform Agama unattended installation with encryption.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/agama_auto
+  - yam/agama/boot_encrypted_partitions
+  - installation/first_boot
+  - console/validate_encrypt
+  - console/validate_partition_table
+  - console/validate_blockdevices
+test_data:
+  crypttab:
+    num_devices_encrypted: 1
+  <<: !include test_data/yast/encryption/default_enc_luks2.yaml
diff --git a/schedule/yam/agama_encrypted_unattended_ppc64le.yaml b/schedule/yam/agama_encrypted_unattended_ppc64le.yaml
@@ -0,0 +1,16 @@
+---
+name: Agama unattended with encryption
+description: >
+  Perform Agama unattended installation with encryption on ppc64le.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/patch_agama_tests
+  - yam/agama/agama
+  - boot/reconnect_mgmt_console
+  - yam/agama/boot_encrypted_partitions
+  - installation/first_boot
+  - console/validate_encrypt
+test_data:
+  crypttab:
+    num_devices_encrypted: 1
+  <<: !include test_data/yast/encryption/default_enc_luks2.yaml
diff --git a/schedule/yam/agama_encrypted_unattended_s390x.yaml b/schedule/yam/agama_encrypted_unattended_s390x.yaml
@@ -0,0 +1,16 @@
+---
+name: Agama unattended with encryption
+description: >
+  Perform Agama unattended installation with encryption on s390x.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/patch_agama_tests
+  - yam/agama/agama
+  - boot/reconnect_mgmt_console
+  - yam/agama/boot_encrypted_partitions
+  - installation/first_boot
+  - console/validate_encrypt
+test_data:
+  crypttab:
+    num_devices_encrypted: 1
+  <<: !include test_data/yast/encryption/default_enc_luks2.yaml
diff --git a/schedule/yam/agama_full_disk_encryption.yaml b/schedule/yam/agama_full_disk_encryption.yaml
@@ -7,7 +7,7 @@ schedule:
   - yam/agama/import_agama_profile
   - yam/agama/patch_agama_tests
   - yam/agama/agama
-  - yam/agama/boot_full_disk_encryption
+  - yam/agama/boot_encrypted_partitions
   - installation/first_boot
   - console/validate_encrypt
 test_data:
diff --git a/schedule/yam/agama_full_disk_encryption_ppc64le.yaml b/schedule/yam/agama_full_disk_encryption_ppc64le.yaml
@@ -8,7 +8,7 @@ schedule:
   - yam/agama/patch_agama_tests
   - yam/agama/agama
   - boot/reconnect_mgmt_console
-  - yam/agama/boot_full_disk_encryption
+  - yam/agama/boot_encrypted_partitions
   - installation/first_boot
   - console/validate_encrypt
 test_data:
diff --git a/schedule/yam/agama_unattended.yaml b/schedule/yam/agama_unattended.yaml
@@ -0,0 +1,15 @@
+---
+name: agama_unattended
+description: >
+  Prepare url for agama.auto boot parameter, boot, perform auto-installation with agama and publish qcow.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/agama_auto
+  - installation/grub_test
+  - installation/first_boot
+  - yam/validate/validate_base_product
+  - yam/validate/validate_first_user
+  - yam/validate/validate_hostname
+  - shutdown/grub_set_bootargs
+  - shutdown/cleanup_before_shutdown
+  - shutdown/shutdown
diff --git a/schedule/yam/agama_unattended_ppc64le.yaml b/schedule/yam/agama_unattended_ppc64le.yaml
@@ -0,0 +1,15 @@
+---
+name: agama_unattended_ppc64le
+description: >
+  Prepare url for agama.auto boot parameter, boot, perform auto-installation with agama and publish qcow on ppc64le.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/patch_agama_tests
+  - yam/agama/agama
+  - installation/grub_test
+  - installation/first_boot
+  - yam/validate/validate_base_product
+  - yam/validate/validate_first_user
+  - shutdown/grub_set_bootargs
+  - shutdown/cleanup_before_shutdown
+  - shutdown/shutdown
diff --git a/schedule/yam/agama_unattended_s390x.yaml b/schedule/yam/agama_unattended_s390x.yaml
@@ -0,0 +1,16 @@
+---
+name: agama_unattended_s390x
+description: >
+  Prepare url for agama.auto boot parameter, boot, perform unattended installation with agama and publish qcow on s390x.
+schedule:
+  - yam/agama/boot_agama
+  - yam/agama/patch_agama_tests
+  - yam/agama/agama
+  - boot/reconnect_mgmt_console
+  - installation/first_boot
+  - yam/validate/validate_base_product
+  - yam/validate/validate_first_user
+  - shutdown/grub_set_bootargs
+  - shutdown/cleanup_before_shutdown
+  - shutdown/shutdown
+  - shutdown/svirt_upload_assets
diff --git a/test_data/yam/agama_resize.yaml b/test_data/yam/agama_resize.yaml
@@ -0,0 +1,20 @@
+---
+disks:
+  - name: vda
+    table_type: gpt
+    allowed_unpartitioned: 0.00GB
+    partitions:
+      - name: vda2
+        mounting_options:
+          mount_point: /
+        size: 12.5G
+      - name: vda3
+        mounting_options:
+          should_mount: 1
+          mount_point: SWAP
+        size: 1G
+      - name: vda4
+        mounting_options:
+          should_mount: 1
+          mount_point: HOME
+        size: 25.5G
diff --git a/tests/console/validate_blockdevices.pm b/tests/console/validate_blockdevices.pm
@@ -20,6 +20,7 @@ use filesystem_utils qw(
 sub run {
     select_console('root-console');
     my $disks = get_test_suite_data()->{disks};
+    my $size = get_test_suite_data()->{size};
 
     my $has_mountpoints_col = is_lsblk_able_to_display_mountpoints();
 
@@ -28,12 +29,14 @@ sub run {
         $errors .= validate_lsblk(
             device => $disk,
             type => 'disk',
+            size => $size,
             has_mountpoints_col => $has_mountpoints_col);
         foreach my $part (@{$disk->{partitions}}) {
             my $part_type = ${part}->{type} // 'part';
             $errors .= validate_lsblk(
                 device => $part,
                 type => $part_type,
+                size => $size,
                 has_mountpoints_col => $has_mountpoints_col);
         }
     }
diff --git a/tests/yam/agama/boot_encrypted_partitions.pm b/tests/yam/agama/boot_encrypted_partitions.pm
@@ -0,0 +1,40 @@
+# Copyright 2025 SUSE LLC
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Summary: Boot the system with encrypted partitions.
+# Maintainer: QE YaST and Migration (QE Yam) <qe-yam at suse de>
+
+use base 'opensusebasetest';
+use strict;
+use warnings;
+use testapi;
+
+sub run {
+    my $enter_passphrase_for_root = $testapi::distri->get_enter_passphrase_for_root();
+    my $enter_passphrase_for_swap = $testapi::distri->get_enter_passphrase_for_swap();
+    my $enter_passphrase_for_home = $testapi::distri->get_enter_passphrase_for_home();
+    my $grub_menu = $testapi::distri->get_grub_menu_installed_system();
+
+    if (get_var('ENCRYPTED_PARTITIONS') =~ /root/) {
+        $enter_passphrase_for_root->expect_is_shown();
+        $enter_passphrase_for_root->enter();
+    }
+
+    $grub_menu->expect_is_shown();
+    $grub_menu->select_first_entry();
+
+    if (get_var('ENCRYPTED_PARTITIONS') =~ /swap/) {
+        $enter_passphrase_for_swap->expect_is_shown();
+        $enter_passphrase_for_swap->enter();
+    }
+    if (get_var('ENCRYPTED_PARTITIONS') =~ /home/) {
+        $enter_passphrase_for_home->expect_is_shown();
+        $enter_passphrase_for_home->enter();
+    }
+}
+
+sub test_flags {
+    return {fatal => 1};
+}
+
+1;
diff --git a/tests/yam/agama/boot_full_disk_encryption.pm b/tests/yam/agama/boot_full_disk_encryption.pm

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ function(bootloader=false,`
`48`	`48`	`[if storage == 'lvm_tpm_fde' then 'storage']: storage_lib['lvm_tpm_fde'],`
`49`	`49`	`[if storage == 'root_filesystem_ext4' then 'storage']: storage_lib['root_filesystem_ext4'],`
`50`	`50`	`[if storage == 'root_filesystem_xfs' then 'storage']: storage_lib['root_filesystem_xfs'],`
	`51`	`+ [if storage == 'resize_vda' then 'storage']: storage_lib['resize_fixed_vda'],`
`51`	`52`	`[if storage == 'whole_disk_and_boot_unattended' then 'storage']: storage_lib['whole_disk_and_boot_unattended'],`
`52`	`53`	`[if user == true then 'user']: base_lib['user'],`
`53`	`54`	`}`