From be0a505910901ad1d81e60259b0e33772b4a6f60 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 29 Nov 2023 07:04:18 -0600 Subject: [PATCH 01/16] (PA-5749) Add Debian 12 bookworm platforms for main Includes amd64 for PA-5553 --- configs/platforms/debian-12-aarch64.rb | 3 +++ configs/platforms/debian-12-amd64.rb | 3 +++ configs/platforms/debian-12-armhf.rb | 10 ++++++++++ 3 files changed, 16 insertions(+) create mode 100644 configs/platforms/debian-12-aarch64.rb create mode 100644 configs/platforms/debian-12-amd64.rb create mode 100644 configs/platforms/debian-12-armhf.rb diff --git a/configs/platforms/debian-12-aarch64.rb b/configs/platforms/debian-12-aarch64.rb new file mode 100644 index 0000000000..0f3c9c0ade --- /dev/null +++ b/configs/platforms/debian-12-aarch64.rb @@ -0,0 +1,3 @@ +platform "debian-12-aarch64" do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/debian-12-amd64.rb b/configs/platforms/debian-12-amd64.rb new file mode 100644 index 0000000000..dcec455c19 --- /dev/null +++ b/configs/platforms/debian-12-amd64.rb @@ -0,0 +1,3 @@ +platform "debian-12-amd64" do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/debian-12-armhf.rb b/configs/platforms/debian-12-armhf.rb new file mode 100644 index 0000000000..6df81a3e3e --- /dev/null +++ b/configs/platforms/debian-12-armhf.rb @@ -0,0 +1,10 @@ +platform "debian-12-armhf" do |plat| + plat.servicedir "/lib/systemd/system" + plat.defaultdir "/etc/default" + plat.servicetype "systemd" + plat.codename "bookworm" + + packages = ['build-essential', 'devscripts', 'rsync', 'fakeroot', 'debhelper'] + plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" + plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " +end From b08f06b9e9fed77957783bda0ead507fd73cb285 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 29 Nov 2023 12:27:10 -0600 Subject: [PATCH 02/16] (maint) remove vanagon overrides --- configs/platforms/debian-11-amd64.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configs/platforms/debian-11-amd64.rb b/configs/platforms/debian-11-amd64.rb index 158baf258b..93239246cc 100644 --- a/configs/platforms/debian-11-amd64.rb +++ b/configs/platforms/debian-11-amd64.rb @@ -1,15 +1,3 @@ platform "debian-11-amd64" do |plat| - # Delete the lines below when a vanagon with Debian 11 support is released - plat.servicedir "/lib/systemd/system" - plat.defaultdir "/etc/default" - plat.servicetype "systemd" - plat.codename "bullseye" - plat.vmpooler_template "debian-11-x86_64" - plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " - packages = %w(build-essential devscripts debhelper rsync fakeroot) - plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" - - # Uncomment these when a vanagon with Debian 11 support is released - # plat.inherit_from_default - # plat.clear_provisioning + plat.inherit_from_default end From 3834b13ef9536d15d47c0f8593f206eb9363b582 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 4 Dec 2023 09:18:24 -0800 Subject: [PATCH 03/16] (maint) Bump scheduled_task module to 3.2.0 This commit bumps the scheduled_task module from 3.1.1 to 3.2.0. The primary change is managing the description field for a scheduled task. --- configs/components/module-puppetlabs-scheduled_task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/module-puppetlabs-scheduled_task.json b/configs/components/module-puppetlabs-scheduled_task.json index 5c2925fad7..849a20097f 100644 --- a/configs/components/module-puppetlabs-scheduled_task.json +++ b/configs/components/module-puppetlabs-scheduled_task.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppetlabs-scheduled_task.git","ref":"refs/tags/v3.1.1"} +{"url":"git@github.com:puppetlabs/puppetlabs-scheduled_task.git","ref":"refs/tags/v3.2.0"} From 1795df8fc2c0b61a8b00af89e2efe837683e8f1e Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Mon, 11 Dec 2023 22:38:36 +0000 Subject: [PATCH 04/16] (maint) Update facter to 69b0978f47b04d14d037bb62f0fd39ddb684b7a8 Generated by CI --- configs/components/facter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/facter.json b/configs/components/facter.json index 9d2df309b1..9adf897c4a 100644 --- a/configs/components/facter.json +++ b/configs/components/facter.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/facter.git","ref":"352e2a8bd7a6f1d156be99c3889460130a4a0c68"} +{"url":"git@github.com:puppetlabs/facter.git","ref":"69b0978f47b04d14d037bb62f0fd39ddb684b7a8"} From 1e146b80f557630aef375edb39095be243550656 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 12 Dec 2023 01:06:08 +0000 Subject: [PATCH 05/16] (maint) Update pxp-agent to 202312071 Generated by CI --- configs/components/pxp-agent.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/pxp-agent.json b/configs/components/pxp-agent.json index c90ac59550..c4a63d8050 100644 --- a/configs/components/pxp-agent.json +++ b/configs/components/pxp-agent.json @@ -1 +1 @@ -{"location":"https://builds.delivery.puppetlabs.net/pxp-agent/202312060/artifacts/","version":"202312060"} +{"location":"https://builds.delivery.puppetlabs.net/pxp-agent/202312071/artifacts/","version":"202312071"} From a07d58d63000dc71dcc42d5020cbdef35ecb2dc9 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 12 Dec 2023 01:06:08 +0000 Subject: [PATCH 06/16] (maint) Update puppet-runtime to 202312070 Generated by CI --- configs/components/puppet-runtime.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet-runtime.json b/configs/components/puppet-runtime.json index 49d141d310..e7961bf168 100644 --- a/configs/components/puppet-runtime.json +++ b/configs/components/puppet-runtime.json @@ -1 +1 @@ -{"location":"https://builds.delivery.puppetlabs.net/puppet-runtime/202312050/artifacts/","version":"202312050"} +{"location":"https://builds.delivery.puppetlabs.net/puppet-runtime/202312070/artifacts/","version":"202312070"} From 51db11724b41c3d2c5cc027119cd00e199426526 Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Wed, 13 Dec 2023 14:45:09 +0530 Subject: [PATCH 07/16] (PA-5910) Update macos14 arm in build_defaults for internal nightlies ship --- ext/build_defaults.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml index 04865fa23a..780c59b364 100644 --- a/ext/build_defaults.yaml +++ b/ext/build_defaults.yaml @@ -22,6 +22,7 @@ foss_platforms: - osx-12-x86_64 - osx-13-x86_64 - osx-14-x86_64 + - osx-14-arm64 - sles-12-x86_64 - sles-15-x86_64 - ubuntu-18.04-amd64 @@ -94,6 +95,8 @@ platform_repos: repo_location: repos/apple/13/**/x86_64/*.dmg - name: osx-14-x86_64 repo_location: repos/apple/14/**/x86_64/*.dmg + - name: osx-14-arm64 + repo_location: repos/apple/14/**/arm64/*.dmg - name: solaris-11-i386 repo_location: repos/solaris/11/**/*.i386.p5p - name: solaris-11-sparc From 0b3e4d3e2c12b9f31a9aab56d5a8f07995ff841f Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 13 Dec 2023 23:58:10 +0000 Subject: [PATCH 08/16] (maint) Update facter to 0cd73de41be37600111ebcd80ee981c343980542 Generated by CI --- configs/components/facter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/facter.json b/configs/components/facter.json index 9adf897c4a..328ca9dbe3 100644 --- a/configs/components/facter.json +++ b/configs/components/facter.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/facter.git","ref":"69b0978f47b04d14d037bb62f0fd39ddb684b7a8"} +{"url":"git@github.com:puppetlabs/facter.git","ref":"0cd73de41be37600111ebcd80ee981c343980542"} From 409157af017d74ce2acc2c8aeec04ebf5cc3ef66 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Mon, 18 Dec 2023 19:58:25 +0000 Subject: [PATCH 09/16] (maint) Update facter to 7f853556379a21fbf8d5d5bd7b47e189c6e5924f Generated by CI --- configs/components/facter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/facter.json b/configs/components/facter.json index 328ca9dbe3..566b1dc4a0 100644 --- a/configs/components/facter.json +++ b/configs/components/facter.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/facter.git","ref":"0cd73de41be37600111ebcd80ee981c343980542"} +{"url":"git@github.com:puppetlabs/facter.git","ref":"7f853556379a21fbf8d5d5bd7b47e189c6e5924f"} From 44179d76bf8c770bbe81d79d4c5905306e30d1c1 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Mon, 18 Dec 2023 20:13:18 +0000 Subject: [PATCH 10/16] (maint) Update facter to 3678f606c3b53a6df76547e969d6169581d3425a Generated by CI --- configs/components/facter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/facter.json b/configs/components/facter.json index 566b1dc4a0..ff392def0c 100644 --- a/configs/components/facter.json +++ b/configs/components/facter.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/facter.git","ref":"7f853556379a21fbf8d5d5bd7b47e189c6e5924f"} +{"url":"git@github.com:puppetlabs/facter.git","ref":"3678f606c3b53a6df76547e969d6169581d3425a"} From 9a4360745d5b0d4e44a0de70ff9d16f5462cb60e Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 18:39:13 +0000 Subject: [PATCH 11/16] (maint) Update puppet to 554eb96993bcb31ac1d9e8f6320ce0281541d78e Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 5579794a53..8c1f7dfce7 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"775592ccaf6de297ea1cc95c593a7d09edcda19c"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"554eb96993bcb31ac1d9e8f6320ce0281541d78e"} From ab2a3765c1776d1a19dd88cd4b45918f02c6d5a9 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 19:56:46 +0000 Subject: [PATCH 12/16] (maint) Update puppet to 9b6c049ef18facbd7a79176a48455a8bec13ffeb Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 8c1f7dfce7..a89210fa0b 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"554eb96993bcb31ac1d9e8f6320ce0281541d78e"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"9b6c049ef18facbd7a79176a48455a8bec13ffeb"} From e3060d5f4acbd83813c76b243ea0f136ec7e3c7b Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 20:54:03 +0000 Subject: [PATCH 13/16] (maint) Update puppet to 3582a39597226ed15f4302c059f4d7192a2252f7 Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index a89210fa0b..88e5ef4c83 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"9b6c049ef18facbd7a79176a48455a8bec13ffeb"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"3582a39597226ed15f4302c059f4d7192a2252f7"} From 305b1793ce01499c51deb722f23bdd6c98d74193 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 21:11:03 +0000 Subject: [PATCH 14/16] (maint) Update puppet to 3e8e5c718c7dd36bcd3811fbc4b0338594d3c8ab Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 88e5ef4c83..56e7e70f52 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"3582a39597226ed15f4302c059f4d7192a2252f7"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"3e8e5c718c7dd36bcd3811fbc4b0338594d3c8ab"} From 68a704b1362199d4f614b44da063af3b32729251 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 23:08:11 +0000 Subject: [PATCH 15/16] (maint) Update puppet to 4ae7055452be95fdc121039851ebe38df837835c Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 56e7e70f52..066efdfda9 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"3e8e5c718c7dd36bcd3811fbc4b0338594d3c8ab"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"4ae7055452be95fdc121039851ebe38df837835c"} From 0626d988415f338945404039803138edbced316b Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Tue, 19 Dec 2023 23:24:04 +0000 Subject: [PATCH 16/16] (maint) Update puppet to 9ceca21e565f0771b9bffe88a20894506c015602 Generated by CI --- configs/components/puppet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 066efdfda9..84cee6ff57 100644 --- a/configs/components/puppet.json +++ b/configs/components/puppet.json @@ -1 +1 @@ -{"url":"git@github.com:puppetlabs/puppet.git","ref":"4ae7055452be95fdc121039851ebe38df837835c"} +{"url":"git@github.com:puppetlabs/puppet.git","ref":"9ceca21e565f0771b9bffe88a20894506c015602"}