os-autoinst · rwx788 · Jan 11, 2021 · Jan 8, 2021
diff --git a/lib/validate_encrypt_utils.pm b/lib/validate_encrypt_utils.pm
@@ -37,7 +37,7 @@ our @EXPORT = qw(
   verify_cryptsetup_properties
   verify_restoring_luks_backups
   verify_locked_encrypted_partition
-  validate_activation_encrypted_partition
+  validate_encrypted_volume_activation
 );
 
 =head2 parse_devices_in_crypttab
@@ -231,7 +231,7 @@ sub verify_locked_encrypted_partition {
     record_info('lock OK', "Encrypted partition '/dev/$enc_disk_part' still locked");
 }
 
-sub validate_activation_encrypted_partition {
+sub validate_encrypted_volume_activation {
     my ($args) = @_;
     select_console 'install-shell';
     my $status = parse_cryptsetup_status($args->{mapped_device});

diff --git a/.../autoyast_cryptlvm+activate_existing.yaml → ...t/autoyast_activate_encrypted_volume.yaml b/.../autoyast_cryptlvm+activate_existing.yaml → ...t/autoyast_activate_encrypted_volume.yaml
@@ -1,5 +1,5 @@
 ---
-name: autoyast_cryptlvm+activate_existing
+name: autoyast_activate_encrypted_volume
 description: >
     Conduct autoyast installation activating encrypted partitions
 vars:

diff --git a/...vm+activate_existing+force_recompute.yaml → ...ate_encrypted_volume+force_recompute.yaml b/...vm+activate_existing+force_recompute.yaml → ...ate_encrypted_volume+force_recompute.yaml
@@ -3,7 +3,7 @@ description: >
   Conduct installation activating encrypted partitions, but creating encrypted
   lvm setup from scratch. Using pre-partitioned disk image to validate encrypted
   partitions activation and that we can re-ecnrypt the disk.
-name: cryptlvm+activate_existing+force_recompute
+name: activate_encrypted_volume+force_recompute
 vars:
   ENCRYPT: 1
   ENCRYPT_ACTIVATE_EXISTING: 1

diff --git a/...ctivate_existing+force_recompute_pvm.yaml → ...encrypted_volume+force_recompute_pvm.yaml b/...ctivate_existing+force_recompute_pvm.yaml → ...encrypted_volume+force_recompute_pvm.yaml
@@ -5,7 +5,7 @@ description: >
   partitions activation and that we can re-ecnrypt the disk.
   For powerVM we have to disable plymouth, so edit_optional_kernel_cmd_parameters
   module is scheduled and OPT_KERNEL_PARAMS variable is set.
-name: cryptlvm+activate_existing+force_recompute
+name: activate_encrypted_volume+force_recompute
 vars:
   ENCRYPT: 1
   ENCRYPT_ACTIVATE_EXISTING: 1

diff --git a/...ptlvm+activate_existing+import_users.yaml → ...tivate_encrypted_volume+import_users.yaml b/...ptlvm+activate_existing+import_users.yaml → ...tivate_encrypted_volume+import_users.yaml
@@ -3,7 +3,7 @@ description: >
   Conduct installation activating encrypted partitions and importing users created
   in that installation. Using pre-partitioned disk image to validate encrypted
   partitions activation and that we can re-ecnrypt the disk.
-name: cryptlvm+activate_existing+import_users
+name: activate_encrypted_volume+import_users
 vars:
   ENCRYPT_ACTIVATE_EXISTING: 1
 schedule:
@@ -28,5 +28,4 @@ schedule:
   - installation/logs_from_installation_system
   - installation/reboot_after_installation
   - installation/grub_test
-  - installation/boot_encrypt
   - installation/first_boot
diff --git a/...m+activate_existing+import_users_pvm.yaml → ...te_encrypted_volume+import_users_pvm.yaml b/...m+activate_existing+import_users_pvm.yaml → ...te_encrypted_volume+import_users_pvm.yaml
@@ -5,7 +5,7 @@ description: >
   partitions activation and that we can re-ecnrypt the disk.
   Separate schedule is used because on powerVM we simulate existing users on the
   encrypted partition by injecting /etc/passwd and /etc/shadow files.
-name: cryptlvm+activate_existing+import_users
+name: activate_encrypted_volume+import_users
 vars:
   ENCRYPT_ACTIVATE_EXISTING: 1
   ETC_PASSWD: "bernhard:x:1000:100:bernhard:/home/bernhard:/bin/bash"
@@ -32,6 +32,5 @@ schedule:
   - installation/reboot_after_installation
   - boot/reconnect_mgmt_console
   - installation/grub_test
-  - installation/boot_encrypt
   - installation/first_boot
   - console/validate_user_login_textmode
diff --git a/...ncryption/cryptlvm+activate_existing.yaml → ...encryption/activate_encrypted_volume.yaml b/...ncryption/cryptlvm+activate_existing.yaml → ...encryption/activate_encrypted_volume.yaml
@@ -2,7 +2,7 @@
 description: >
   Conduct installation trying to reuse encrypted partitions (bsc#993247). Using
   pre-partitioned disk image to validate encrypted partitions activation.
-name: cryptlvm+activate_existing
+name: activate_encrypted_volume
 vars:
   ENCRYPT_ACTIVATE_EXISTING: 1
 schedule:
@@ -11,7 +11,7 @@ schedule:
   - installation/accept_license
   - installation/scc_registration
   - installation/encrypted_volume_activation
-  - console/validate_activation_encrypted_partition
+  - console/validate_encrypted_volume_activation
   - installation/addon_products_sle
   - installation/system_role
   - installation/partitioning
@@ -28,7 +28,6 @@ schedule:
   - installation/logs_from_installation_system
   - installation/reboot_after_installation
   - installation/grub_test
-  - installation/boot_encrypt
   - installation/first_boot
 test_data:
-  <<: !include test_data/yast/encryption/cryptlvm+activate_existing.yaml
+  <<: !include test_data/yast/encryption/activate_encrypted_volume.yaml
diff --git a/...tion/cryptlvm+activate_existing_dasd.yaml → ...ption/activate_encrypted_volume_dasd.yaml b/...tion/cryptlvm+activate_existing_dasd.yaml → ...ption/activate_encrypted_volume_dasd.yaml
@@ -4,7 +4,7 @@ description: >
   pre-partitioned disk image to validate encrypted partitions activation. For
   zVM we activate DASD disk which we format in from of the installation and create
   encrypted partition on it, similarly to powerVM.
-name: cryptlvm+activate_existing
+name: activate_encrypted_volume
 vars:
   ENCRYPT_ACTIVATE_EXISTING: 1
   FORMAT_DASD: pre_install
@@ -15,7 +15,7 @@ schedule:
   - installation/disk_activation
   - installation/scc_registration
   - installation/encrypted_volume_activation
-  - console/validate_activation_encrypted_partition
+  - console/validate_encrypted_volume_activation
   - installation/addon_products_sle
   - installation/system_role
   - installation/partitioning
@@ -30,8 +30,7 @@ schedule:
   - installation/await_install
   - installation/logs_from_installation_system
   - installation/reboot_after_installation
-  - installation/boot_encrypt
   - boot/reconnect_mgmt_console
   - installation/first_boot
 test_data:
-  <<: !include test_data/yast/encryption/cryptlvm+activate_existing.yaml
+  <<: !include test_data/yast/encryption/activate_encrypted_volume.yaml
diff --git a/...tion/cryptlvm+activate_existing_spvm.yaml → ...ption/activate_encrypted_volume_spvm.yaml b/...tion/cryptlvm+activate_existing_spvm.yaml → ...ption/activate_encrypted_volume_spvm.yaml
@@ -4,7 +4,7 @@ description: >
   pre-partitioned disk image to validate encrypted partitions activation. For
   spvm we have to disable plymouth, so edit_optional_kernel_cmd_parameters module
   is scheduled and OPT_KERNEL_PARAMS variable is set.
-name: cryptlvm+activate_existing
+name: activate_encrypted_volume
 vars:
   OPT_KERNEL_PARAMS: console=%SERIALDEV% VNCSize=1024x768
   DESKTOP: textmode
@@ -15,7 +15,7 @@ schedule:
   - installation/accept_license
   - installation/scc_registration
   - installation/encrypted_volume_activation
-  - console/validate_activation_encrypted_partition
+  - console/validate_encrypted_volume_activation
   - installation/addon_products_sle
   - installation/system_role
   - installation/partitioning
@@ -34,7 +34,6 @@ schedule:
   - installation/reboot_after_installation
   - boot/reconnect_mgmt_console
   - installation/grub_test
-  - installation/boot_encrypt
   - installation/first_boot
 test_data:
   mapped_device: '/dev/mapper/cr-auto-1'

diff --git a/schedule/yast/encryption/cryptlvm+cancel_existing.yaml b/schedule/yast/encryption/cryptlvm+cancel_existing.yaml
@@ -3,7 +3,7 @@ description: >
   Conduct installation cancelling encrypted partitions activation, and creating
   encrypted lvm setup from scratch. Using pre-partitioned disk image to validate
   encrypted partitions activation and that we can re-ecnrypt the disk.
-name: cryptlvm+activate_existing
+name: cryptlvm+cancel_existing
 vars:
   ENCRYPT: 1
   ENCRYPT_CANCEL_EXISTING: 1

diff --git a/...ncryption/cryptlvm+activate_existing.yaml → ...encryption/activate_encrypted_volume.yaml b/...ncryption/cryptlvm+activate_existing.yaml → ...encryption/activate_encrypted_volume.yaml
diff --git a/.../autoyast_cryptlvm+activate_existing.yaml → ...n/autoyast_activate_encrypted_volume.yaml b/.../autoyast_cryptlvm+activate_existing.yaml → ...n/autoyast_activate_encrypted_volume.yaml
diff --git a/tests/autoyast/installation.pm b/tests/autoyast/installation.pm
@@ -47,7 +47,7 @@ use Utils::Backends 'is_pvm';
 use scheduler 'get_test_suite_data';
 use autoyast 'test_ayp_url';
 use y2_logs_helper qw(upload_autoyast_profile upload_autoyast_schema);
-use validate_encrypt_utils "validate_activation_encrypted_partition";
+use validate_encrypt_utils "validate_encrypted_volume_activation";
 
 my $confirmed_licenses = 0;
 my $stage              = 'stage1';
@@ -230,7 +230,7 @@ sub run {
         }
         elsif (match_has_tag('autoyast-confirm')) {
             if (get_var('ENCRYPT_ACTIVATE_EXISTING')) {
-                validate_activation_encrypted_partition({
+                validate_encrypted_volume_activation({
                         mapped_device => $test_data->{mapped_device},
                         device_status => $test_data->{device_status}->{message},
                         properties    => $test_data->{device_status}->{properties}

diff --git a/...alidate_activation_encrypted_partition.pm → ...e/validate_encrypted_volume_activation.pm b/...alidate_activation_encrypted_partition.pm → ...e/validate_encrypted_volume_activation.pm
@@ -24,7 +24,7 @@ use validate_encrypt_utils;
 
 sub run {
     my $test_data = get_test_suite_data();
-    validate_activation_encrypted_partition({
+    validate_encrypted_volume_activation({
             mapped_device => $test_data->{mapped_device},
             device_status => $test_data->{device_status}->{message},
             properties    => $test_data->{device_status}->{properties}

diff --git a/tests/installation/boot_encrypt.pm b/tests/installation/boot_encrypt.pm
@@ -19,10 +19,6 @@ use utils;
 use testapi qw(get_var record_info);
 
 sub run {
-    if (get_var('ENCRYPT_ACTIVATE_EXISTING') and !get_var('ENCRYPT_FORCE_RECOMPUTE')) {
-        record_info 'bsc#993247 https://fate.suse.com/321208', 'activated encrypted partition will not be recreated as encrypted';
-        return;
-    }
     unlock_if_encrypted(check_typed_password => 1);
 }