From d9c28e4435471a95d9bf4537635aac4852dcf6ed Mon Sep 17 00:00:00 2001 From: Nick Burgan <13688219+nmburgan@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:20:46 -0700 Subject: [PATCH 1/2] (PE-36861) Update ezbake to 2.5.4 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 9b446f652..0b0be9e60 100644 --- a/project.clj +++ b/project.clj @@ -169,7 +169,7 @@ [puppetlabs/jruby-utils] [puppetlabs/puppetserver ~ps-version] [puppetlabs/trapperkeeper-webserver-jetty9]] - :plugins [[puppetlabs/lein-ezbake "2.5.3"]] + :plugins [[puppetlabs/lein-ezbake "2.5.4"]] :name "puppetserver"} :uberjar {:dependencies [[org.bouncycastle/bcpkix-jdk18on] [puppetlabs/trapperkeeper-webserver-jetty9]] From 09a429ac2966ffe39b86dba8bc6ada97f6bde916 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Fri, 13 Oct 2023 12:43:29 +0000 Subject: [PATCH 2/2] (maint) update submodule versions and agent pin --- acceptance/config/beaker/options.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb index 500558c3f..9b5e8b1bd 100644 --- a/acceptance/config/beaker/options.rb +++ b/acceptance/config/beaker/options.rb @@ -11,5 +11,5 @@ "puppetserver-confdir"=>"/etc/puppetlabs/puppetserver/conf.d", "puppetserver-config"=> "/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf", - :puppet_build_version=>"ed764cb1bbff55d5f830fc4b31b6b414d9e3ebb4", + :puppet_build_version=>"7d77e71ba7196a8a360ec6f3f014d360f4293a6e", :ssh=>{:config=>true}}