Fix libgit2 test in Tumbleweed

os-autoinst · Jul 26, 2024 · 1260220 · 1260220
1 parent e93e9d9
commit 1260220
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/tests/console/libgit2.pm b/tests/console/libgit2.pm
@@ -20,7 +20,6 @@ use utils 'zypper_call';
 use python_version_utils;
 use registration 'add_suseconnect_product';
 
-my $python3_version;
 my $python_sub_version;
 
 sub run {
@@ -33,20 +32,18 @@ sub run {
         add_suseconnect_product('sle-module-development-tools');
         add_suseconnect_product('sle-module-python3');
     }
-    my $pkg_ver = script_output("zypper se '/^libgit2-[0-9].*[0-9]\$/' | awk -F '|' '/libgit2-[0-9]/ {gsub(\" \", \"\"); print \$2}' | uniq");
-    zypper_call "in $pkg_ver libgit2-tools libgit2-devel gcc";
-    record_info("Installed libgit2 version", script_output("rpm -q --qf '%{VERSION}\n' $pkg_ver"));
 
-    # Install the latest python3 package
-    $python3_version = get_available_python_versions('1');
-    zypper_call "in $python3_version $python3_version-devel";
-    $python_sub_version = substr($python3_version, 7);
+    # Install the latest pygit2
+    my @pygit2_versions = split(/\n/, script_output(qq[zypper se '/^python3[0-9]{1,2}-pygit2\$/' | awk -F '|' '/python3[0-9][1,2]/ {gsub(" ", ""); print \$2}' | uniq]));
+    record_info("Available versions", "All available new pygit2 versions are: @pygit2_versions");
+    record_info("The latest version is:", "$pygit2_versions[$#pygit2_versions]");
 
-    # Install pygit2
-    assert_script_run "pip3.$python_sub_version install pygit2 --break-system-packages";
+    zypper_call "in $pygit2_versions[$#pygit2_versions]";
 
     # Run test script
     assert_script_run "wget --quiet " . data_url('libgit2/pygit2_test.py') . " -O pygit2_test.py";
+    my @pkg_version = split(/-/, $pygit2_versions[$#pygit2_versions]);
+    $python_sub_version = substr($pkg_version[0], 7);
     assert_script_run "python3.$python_sub_version pygit2_test.py";
 
     # Cleanup
@@ -55,7 +52,7 @@ sub run {
 
 sub clean_up {
     assert_script_run "pip3.$python_sub_version uninstall pygit2 -y --break-system-packages";
-    zypper_call "rm $python3_version";
+    zypper_call "rm python3$python_sub_version";
     assert_script_run "rm -rf libgit2";
 }