ncm-freeipa: install released version with AII CLI

quattor · Jun 26, 2023 · 3e01d41 · 3e01d41
1 parent 2329abb
commit 3e01d41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ncm-freeipa/src/main/pan/components/freeipa/config.pan b/ncm-freeipa/src/main/pan/components/freeipa/config.pan
@@ -4,7 +4,7 @@ variable FREEIPA_CLI_REQUIRES_PAM_KRB5 ?= true;
 
 'cli_packages' ?= {
  t = list(
- 'ncm-freeipa',
+ 'ncm-freeipa-${no-snapshot-version}-${rpm.release}',
  'nss-pam-ldapd',
  'ipa-client',
  'nss-tools',

diff --git a/ncm-freeipa/src/test/perl/aii-basic.t b/ncm-freeipa/src/test/perl/aii-basic.t
@@ -58,7 +58,7 @@ ok(POST_history_ok([
  ]), "host_add / host_mod called");
 
 
-like($fh, qr(^yum -y install ncm-freeipa nss-pam-ldapd ipa-client nss-tools openssl pam_krb5 -c /tmp/aii/yum/yum.conf$)m,
+like($fh, qr(^yum -y install ncm-freeipa-\d+\.\d+\.\d+-\w+ nss-pam-ldapd ipa-client nss-tools openssl pam_krb5 -c /tmp/aii/yum/yum.conf$)m,
  "install freeipa component and CLI dependencies in post_reboot");
 like($fh, qr(^PERL5LIB=/usr/lib/perl perl -MNCM::Component::FreeIPA::CLI -w -e install -- --realm MY.REALM --primary myhost.example.com --domain com --fqdn myhost.example.com --hostcert 1 --otp 'superse\\\$cret\\\$OTP'$)m,
  "CLI called as expected");