Move systemd_rpm_macros test into phub extratests

fix rpm-build package name
dzedro · Oct 3, 2023 · d19ee51 · d19ee51
1 parent 44f59d2
commit d19ee51
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 4 deletions.
diff --git a/schedule/functional/extra_tests_textmode_phub.yaml b/schedule/functional/extra_tests_textmode_phub.yaml
@@ -12,6 +12,7 @@ schedule:
     - '{{wpa_supplicant}}'
     - console/vmstat
     - console/ansible
+    - console/systemd_rpm_macros
     - console/coredump_collect  # For coredumps during the suite. Please put near end.
     - console/zypper_log_packages  # Records packages installed in the suite. Please put at end.
 conditional_schedule:

diff --git a/schedule/qam/12-SP1/mau-extratests-phub.yaml b/schedule/qam/12-SP1/mau-extratests-phub.yaml
@@ -8,5 +8,6 @@ schedule:
   - console/add_phub_extension
   - console/python_scientific
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 ...
diff --git a/schedule/qam/12-SP2/mau-extratests-phub.yaml b/schedule/qam/12-SP2/mau-extratests-phub.yaml
@@ -8,5 +8,6 @@ schedule:
   - console/add_phub_extension
   - console/python_scientific
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 ...
diff --git a/schedule/qam/12-SP3/mau-extratests-phub.yaml b/schedule/qam/12-SP3/mau-extratests-phub.yaml
@@ -8,5 +8,6 @@ schedule:
   - console/add_phub_extension
   - console/python_scientific
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 ...
diff --git a/schedule/qam/12-SP4/mau-extratests-phub.yaml b/schedule/qam/12-SP4/mau-extratests-phub.yaml
@@ -8,5 +8,6 @@ schedule:
   - console/add_phub_extension
   - console/python_scientific
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 ...
diff --git a/schedule/qam/12-SP5/mau-extratests-phub.yaml b/schedule/qam/12-SP5/mau-extratests-phub.yaml
@@ -8,5 +8,6 @@ schedule:
   - console/add_phub_extension
   - console/python_scientific
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 ...
diff --git a/schedule/qam/15-SP1/mau-extratests-phub.yaml b/schedule/qam/15-SP1/mau-extratests-phub.yaml
@@ -10,6 +10,7 @@ schedule:
   - '{{sle15_x86_64}}'
   - console/python_flake8
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15-SP2/mau-extratests-phub.yaml b/schedule/qam/15-SP2/mau-extratests-phub.yaml
@@ -10,6 +10,7 @@ schedule:
   - '{{sle15_x86_64}}'
   - console/python_flake8
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15-SP3/mau-extratests-phub.yaml b/schedule/qam/15-SP3/mau-extratests-phub.yaml
@@ -11,6 +11,7 @@ schedule:
   - console/python_flake8
   - console/vmstat
   - console/ansible
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15-SP4/mau-extratests-phub.yaml b/schedule/qam/15-SP4/mau-extratests-phub.yaml
@@ -11,6 +11,7 @@ schedule:
   - console/python_flake8
   - console/vmstat
   - '{{arch_specific15_sp4}}'
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15-SP5/mau-extratests-phub.yaml b/schedule/qam/15-SP5/mau-extratests-phub.yaml
@@ -11,6 +11,7 @@ schedule:
   # - console/python_flake8 Removed due to bsc#1209609
   - console/vmstat
   - '{{arch_specific15_sp4}}'
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15/mau-extratests-phub.yaml b/schedule/qam/15/mau-extratests-phub.yaml
@@ -10,6 +10,7 @@ schedule:
   - '{{sle15_x86_64}}'
   - console/python_flake8
   - console/vmstat
+  - console/systemd_rpm_macros
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/common/mau-extratests2.yaml b/schedule/qam/common/mau-extratests2.yaml
@@ -23,7 +23,6 @@ schedule:
   - console/timezone
   - console/procps
   - console/iotop
-  - console/systemd_rpm_macros
   - console/kmod
   - console/suse_module_tools
   - console/aaa_base

diff --git a/tests/console/systemd_rpm_macros.pm b/tests/console/systemd_rpm_macros.pm
@@ -16,10 +16,9 @@ use testapi;
 use serial_terminal 'select_serial_terminal';
 use utils;
 use version_utils;
-use registration qw(add_suseconnect_product);
 
 sub build_mt {
-    zypper_call("in rpmbuild");
+    zypper_call("in rpm-build");
     zypper_call("si multipath-tools");
     assert_script_run("rpmbuild -bb /usr/src/packages/SPECS/multipath-tools.spec", 180);
 }
@@ -40,7 +39,6 @@ sub run {
     if (is_sle '>=15') {
         # enable & disable source repo for multipat-tools source
         assert_script_run(q(zypper mr -e --refresh $(zypper lr|awk '/Basesystem.*Source/ {print$5}')));
-        add_suseconnect_product('PackageHub', undef, undef, undef, 300, 1);
         zypper_call("--gpg-auto-import-keys ref", 300) if (get_var('FIPS') || get_var('FIPS_ENABLED'));
         build_mt();
         assert_script_run(q(zypper mr -d $(zypper lr|awk '/Basesystem.*Source/ {print$5}')));