From f995c8dcb328e9cf64c6be16e5e35295c62d9ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Thu, 10 Sep 2026 15:11:21 -0300
Subject: [PATCH] test(xCAT-test): pin the otherpkgs source form per release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The online configuration is rendered with an otherpkgs repository on a
classic release and on a Deb822 release: the first must carry the
one-line trusted source, the second a Deb822 stanza with Trusted: yes and
no one-line form. Against the previous module the Deb822 case renders the
one-line form.

Signed-off-by: Vinícius Ferrão <2031761+viniciusferrao@users.noreply.github.com>
---
 xCAT-test/unit/ubuntu_subiquity_apt_sources.t | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/unit/ubuntu_subiquity_apt_sources.t b/xCAT-test/unit/ubuntu_subiquity_apt_sources.t
index 0c55d0e8c..d1e53b9d2 100644
--- a/xCAT-test/unit/ubuntu_subiquity_apt_sources.t
+++ b/xCAT-test/unit/ubuntu_subiquity_apt_sources.t
@@ -21,11 +21,32 @@ sub apt_config_for {
     no warnings 'redefine';
     local *xCAT::Template::ubuntu_subiquity_apt_mirror         = sub { $opt{mirror} };
     local *xCAT::Template::ubuntu_subiquity_uses_deb822_sources = sub { $opt{deb822} };
-    local *xCAT::Template::ubuntu_subiquity_otherpkg_sources    = sub { () };
+    local *xCAT::Template::ubuntu_subiquity_otherpkg_sources    = sub { @{ $opt{others} || [] } };
     local *xCAT::Template::ubuntu_subiquity_uses_generated_cdrom_source = sub { 0 };
     return xCAT::Template::ubuntu_subiquity_apt_config('/some/media/dir');
 }
 
+# --- the otherpkgs repository: a one-line source before Deb822, a Deb822 stanza from 24.04 on, ---
+# --- since curtin drops the options of a one-line source when it converts it there            ---
+my $others = [ 'http://192.0.2.10/install/post/otherpkgs/ubuntu24.04/x86_64' ];
+my $classic_others = apt_config_for( mirror => $MIRROR, deb822 => 0, others => $others );
+like( $classic_others, qr{^      xcat-otherpkgs-0\.list:\n        source: "deb \[trusted=yes\] http://192\.0\.2\.10/install/post/otherpkgs/ubuntu24\.04/x86_64 \./"$}m,
+    'classic: the otherpkgs repository is a one-line trusted source' );
+my $deb822_others = apt_config_for( mirror => $MIRROR, deb822 => 1, others => $others );
+like( $deb822_others,
+    qr{^      xcat-otherpkgs-0\.sources:\n        source: \|\n          Types: deb\n          URIs: http://192\.0\.2\.10/install/post/otherpkgs/ubuntu24\.04/x86_64\n          Suites: \./\n          Components:\n          Trusted: yes(?:\n|\z)}m,
+    'Deb822: the otherpkgs repository is a Deb822 stanza carrying Trusted: yes' );
+unlike( $deb822_others, qr/xcat-otherpkgs-0\.list|trusted=yes/, 'Deb822: and no one-line form remains' );
+
+# an otherpkgdir written as URL, suite and components is that source, trusted, not a flat repository at a URL with spaces
+my $mirror_others = [ 'http://mirror.example/ubuntu noble main universe' ];
+like( apt_config_for( mirror => $MIRROR, deb822 => 0, others => $mirror_others ),
+    qr{^      xcat-otherpkgs-0\.list:\n        source: "deb \[trusted=yes\] http://mirror\.example/ubuntu noble main universe"$}m,
+    'classic: an otherpkgdir mirror entry keeps its suite and components' );
+like( apt_config_for( mirror => $MIRROR, deb822 => 1, others => $mirror_others ),
+    qr{^      xcat-otherpkgs-0\.sources:\n        source: \|\n          Types: deb\n          URIs: http://mirror\.example/ubuntu\n          Suites: noble\n          Components: main universe\n          Trusted: yes(?:\n|\z)}m,
+    'Deb822: and becomes a stanza with them as fields, so apt reads one URI' );
+
 # --- online, classic sources (20.04 / 22.04): the archive must be added via sources: ---
 my $classic = apt_config_for( mirror => $MIRROR, deb822 => 0 );