From 4ee7f1993c09ffa69e1c40890a62a59673834ff4 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 26 Jul 2023 12:43:08 +0000 Subject: [PATCH 01/13] (maint) update submodule versions and agent pin --- acceptance/config/beaker/options.rb | 2 +- ruby/facter | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb index 1a49e5707..8b533315d 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=>"cb18222c546ccc484472426b58ebafaff4c45128", + :puppet_build_version=>"b772d2cb0eadc55c2325dae3927ba9f166adae82", :ssh=>{:config=>true}} diff --git a/ruby/facter b/ruby/facter index 47f451d16..0ca97866b 160000 --- a/ruby/facter +++ b/ruby/facter @@ -1 +1 @@ -Subproject commit 47f451d161805ba1cca90e453e6258d8177cb419 +Subproject commit 0ca97866be0c57fc4e34812ab18d1fd993e1554e From 40ded051308ed55e44e5d737f85c00d0fc777d03 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Thu, 27 Jul 2023 12:42:57 +0000 Subject: [PATCH 02/13] (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 8b533315d..a61e71f10 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=>"b772d2cb0eadc55c2325dae3927ba9f166adae82", + :puppet_build_version=>"0b3514f1cac27e253387244c78ddb434ab1ad288", :ssh=>{:config=>true}} From ba245f63b6953e61abd7d20d384bae87e1151dfb Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Fri, 28 Jul 2023 12:43:24 +0000 Subject: [PATCH 03/13] (maint) update submodule versions and agent pin --- acceptance/config/beaker/options.rb | 2 +- ruby/facter | 2 +- ruby/puppet | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb index a61e71f10..7d01cdc19 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=>"0b3514f1cac27e253387244c78ddb434ab1ad288", + :puppet_build_version=>"dc3b151e96482ff4f06b2da28ce931f4a7a9c5fc", :ssh=>{:config=>true}} diff --git a/ruby/facter b/ruby/facter index 0ca97866b..a3236aeb2 160000 --- a/ruby/facter +++ b/ruby/facter @@ -1 +1 @@ -Subproject commit 0ca97866be0c57fc4e34812ab18d1fd993e1554e +Subproject commit a3236aeb2bf9ac717cd81440560a05900b3fcc28 diff --git a/ruby/puppet b/ruby/puppet index cb7a6591a..5baa68a4c 160000 --- a/ruby/puppet +++ b/ruby/puppet @@ -1 +1 @@ -Subproject commit cb7a6591ac29a6935c543d5b8970258b8c91139c +Subproject commit 5baa68a4c22c0fa16d98696072cca38690611033 From a7a8063d2e2790bab65597f07354a3ac202221f6 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Sat, 29 Jul 2023 12:43:08 +0000 Subject: [PATCH 04/13] (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 7d01cdc19..d904965bd 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=>"dc3b151e96482ff4f06b2da28ce931f4a7a9c5fc", + :puppet_build_version=>"cea534f78e1c708a2b31a9b103af61d7a113fcf0", :ssh=>{:config=>true}} From 98463cb1cc3d951fe82527a65804cfb26e127c00 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 1 Aug 2023 12:43:22 +0000 Subject: [PATCH 05/13] (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 d904965bd..5756f021d 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=>"cea534f78e1c708a2b31a9b103af61d7a113fcf0", + :puppet_build_version=>"f6576423060944ae295e693039d6ad85875cb96f", :ssh=>{:config=>true}} From 03bbc29f716f424cb89238d93dd94c3a45063d79 Mon Sep 17 00:00:00 2001 From: Arthur Lawson Date: Mon, 31 Jul 2023 11:15:16 -0700 Subject: [PATCH 06/13] (PE-36076) Remove content type from certificate reject Previously, when a `DELETE` request was sent to `puppet-ca/v1/certificate_status/` a 204 response was sent with a malformed content-type header. This commit removes the header. --- .../services/ca/certificate_authority_core.clj | 9 ++++++--- .../services/ca/certificate_authority_core_test.clj | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/clj/puppetlabs/services/ca/certificate_authority_core.clj b/src/clj/puppetlabs/services/ca/certificate_authority_core.clj index ac8b86906..7ed001534 100644 --- a/src/clj/puppetlabs/services/ca/certificate_authority_core.clj +++ b/src/clj/puppetlabs/services/ca/certificate_authority_core.clj @@ -132,9 +132,12 @@ ca-settings :- ca/CaSettings] (let [response (ca/delete-certificate-request! ca-settings subject) outcomes->codes {:success 204 :not-found 404 :error 500}] - (-> (rr/response (:message response)) - (rr/status ((response :outcome) outcomes->codes)) - (rr/content-type "text/plain")))) + (if (not= (response :outcome) :success) + (-> (rr/response (:message response)) + (rr/status ((response :outcome) outcomes->codes)) + (rr/content-type "text/plain")) + (-> (rr/response (:message response)) + (rr/status ((response :outcome) outcomes->codes)))))) (schema/defn handle-get-ca-expirations [ca-settings :- ca/CaSettings] diff --git a/test/unit/puppetlabs/services/ca/certificate_authority_core_test.clj b/test/unit/puppetlabs/services/ca/certificate_authority_core_test.clj index 6bb71fe28..177d998d0 100644 --- a/test/unit/puppetlabs/services/ca/certificate_authority_core_test.clj +++ b/test/unit/puppetlabs/services/ca/certificate_authority_core_test.clj @@ -321,7 +321,6 @@ (is (false? (fs/exists? expected-path))) (is (= 204 (:status response))) (is (re-matches msg-matcher (:body response))) - (is (= "text/plain" (get-in response [:headers "Content-Type"]))) (is (logged? msg-matcher :debug))) (finally (fs/delete expected-path)))))) From ee54d48becce50128092a298c955821058812865 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 2 Aug 2023 12:43:09 +0000 Subject: [PATCH 07/13] (maint) update submodule versions and agent pin --- acceptance/config/beaker/options.rb | 2 +- ruby/facter | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb index 5756f021d..696b9032b 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=>"f6576423060944ae295e693039d6ad85875cb96f", + :puppet_build_version=>"aa46331db445037d0747efe8a232d8338643311f", :ssh=>{:config=>true}} diff --git a/ruby/facter b/ruby/facter index a3236aeb2..a95d1b417 160000 --- a/ruby/facter +++ b/ruby/facter @@ -1 +1 @@ -Subproject commit a3236aeb2bf9ac717cd81440560a05900b3fcc28 +Subproject commit a95d1b41708a67949ccb05109b7044b0fd340c2b From e9309273fac98f49b07cbf1541304592bc1b3d55 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 2 Aug 2023 17:21:35 +0000 Subject: [PATCH 08/13] Set clj-parent=5.5.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 17610dab2..e4fdd3249 100644 --- a/project.clj +++ b/project.clj @@ -27,7 +27,7 @@ :min-lein-version "2.9.1" - :parent-project {:coords [puppetlabs/clj-parent "5.4.0"] + :parent-project {:coords [puppetlabs/clj-parent "5.5.0"] :inherit [:managed-dependencies]} :dependencies [[org.clojure/clojure] From aa02609202c69067346b14cc26bd61e01e915de2 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Thu, 3 Aug 2023 12:43:17 +0000 Subject: [PATCH 09/13] (maint) update submodule versions and agent pin --- ruby/facter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/facter b/ruby/facter index a95d1b417..65a01b9a7 160000 --- a/ruby/facter +++ b/ruby/facter @@ -1 +1 @@ -Subproject commit a95d1b41708a67949ccb05109b7044b0fd340c2b +Subproject commit 65a01b9a73cee9e3d59a7ffbb42059c940e136e4 From de2eb0729e0f8b657323cb40c0f343970ebb0d14 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Fri, 4 Aug 2023 12:42:56 +0000 Subject: [PATCH 10/13] (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 696b9032b..8b0cca16c 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=>"aa46331db445037d0747efe8a232d8338643311f", + :puppet_build_version=>"87d25fe890f53de16791871e3a4757f4c8122862", :ssh=>{:config=>true}} From 400c4f71ab1d1da125a45333918f974dd77b3a33 Mon Sep 17 00:00:00 2001 From: Austin Blatt Date: Fri, 4 Aug 2023 08:33:11 -0700 Subject: [PATCH 11/13] (maint) Update ezbake to 2.5.3 contains a fix for el9 package builds for Puppet Platform 8 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index e4fdd3249..fc3a07eb3 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.2"]] + :plugins [[puppetlabs/lein-ezbake "2.5.3"]] :name "puppetserver"} :uberjar {:dependencies [[org.bouncycastle/bcpkix-jdk18on] [puppetlabs/trapperkeeper-webserver-jetty9]] From 0662e58738b06dd003ce2cabd74bdce7c459a40e Mon Sep 17 00:00:00 2001 From: rileynewton <95654936+rileynewton@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:21:47 -0700 Subject: [PATCH 12/13] (maint) Add nss install exception for el-9 --- acceptance/suites/pre_suite/foss/70_install_puppet.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acceptance/suites/pre_suite/foss/70_install_puppet.rb b/acceptance/suites/pre_suite/foss/70_install_puppet.rb index 166d741a6..33ed74a82 100644 --- a/acceptance/suites/pre_suite/foss/70_install_puppet.rb +++ b/acceptance/suites/pre_suite/foss/70_install_puppet.rb @@ -21,10 +21,10 @@ nss_package_name="nss" end if nss_package_name - if master['platform'] != 'el-8-x86_64' - master.upgrade_package(nss_package_name) - else + if master['platform'] == 'el-8-x86_64' || master['platform'] == 'el-9-x86_64' master.install_package(nss_package_name) + else + master.upgrade_package(nss_package_name) end else logger.warn("Don't know what nss package to use for #{variant} so not installing one") From 887a85464e9124f0917570104e35f9c5ef7fac1e Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 8 Aug 2023 12:43:20 +0000 Subject: [PATCH 13/13] (maint) update submodule versions and agent pin --- acceptance/config/beaker/options.rb | 2 +- ruby/facter | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb index 8b0cca16c..d43703163 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=>"87d25fe890f53de16791871e3a4757f4c8122862", + :puppet_build_version=>"13d19f6de8986623375fa5ec61f2013e40caf17a", :ssh=>{:config=>true}} diff --git a/ruby/facter b/ruby/facter index 65a01b9a7..af7272b4f 160000 --- a/ruby/facter +++ b/ruby/facter @@ -1 +1 @@ -Subproject commit 65a01b9a73cee9e3d59a7ffbb42059c940e136e4 +Subproject commit af7272b4fee8ee5f027dc5b4b20cfd91aeb4defd