Merge pull request #23 from shubhamshinde360/PA-6047

(PA-6047) Add support for Ubuntu 24.04
puppetlabs · Jun 21, 2024 · f321cca · f321cca
2 parents 5930e9e + 3bdd09a
commit f321cca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/install.sh b/install.sh
@@ -789,11 +789,7 @@ install_file() {
       fi
 
       rpm -Uvh --oldpackage --replacepkgs "$2"
-      if exists dnf; then
-        PKGCMD=dnf
-      else
-        PKGCMD=yum
-      fi
+      exists dnf && PKGCMD=dnf || PKGCMD=yum
       if test "$version" = 'latest'; then
         run_cmd "${PKGCMD} install -y puppet-agent && ${PKGCMD} upgrade -y puppet-agent"
       else
@@ -950,6 +946,7 @@ case $platform in
       "18.04") deb_codename="bionic";;
       "20.04") deb_codename="focal";;
       "22.04") deb_codename="jammy";;
+      "24.04") deb_codename="noble";;
     esac
     filetype="deb"
     filename="${collection}-release-${deb_codename}.deb"

diff --git a/modules/puppet_agent b/modules/puppet_agent
+2 −1		task_spec/spec/acceptance/init_spec.rb
+1 −0		tasks/install_shell.sh