diff --git a/configs/components/facter.json b/configs/components/facter.json index 9d2df309b1..ff392def0c 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":"3678f606c3b53a6df76547e969d6169581d3425a"} 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"} 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"} diff --git a/configs/components/puppet.json b/configs/components/puppet.json index 5579794a53..84cee6ff57 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":"9ceca21e565f0771b9bffe88a20894506c015602"} 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"} 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 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 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