Skip to content

Commit

Permalink
(PA-6330) Add Windows 2016 FIPS platform definition to puppet-agent-7.x
Browse files Browse the repository at this point in the history
(PA-6330) Fix Rubocop

(PA-6330) Updated puppet.json

(PA-6330) Update wix
  • Loading branch information
skyamgarp committed Sep 13, 2024
1 parent e54dfdd commit d56a340
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion configs/components/puppet-runtime.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"location":"https://builds.delivery.puppetlabs.net/puppet-runtime/202409090/artifacts/","version":"202409090"}
{"location":"https://builds.delivery.puppetlabs.net/puppet-runtime/939be69ff93b0455282e8a7914135ed550707162/artifacts/","version":"202310020.285.g939be69"}
2 changes: 1 addition & 1 deletion configs/components/pxp-agent.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"location":"https://builds.delivery.puppetlabs.net/pxp-agent/202409090/artifacts/","version":"202409090"}
{"location":"https://builds.delivery.puppetlabs.net/pxp-agent/2dd3a9638d7fdd64b373e3d6f044479d11917cca/artifacts/","version":"202306061.171.g2dd3a96"}
28 changes: 28 additions & 0 deletions configs/platforms/windowsfips-2016-x64.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
platform "windowsfips-2016-x64" do |plat|
plat.vmpooler_template 'win-2016-fips-x86_64'
plat.servicetype 'windows'

# We need to ensure we install chocolatey prior to adding any nuget repos. Otherwise, everything will fall over
plat.add_build_repository "https://artifactory.delivery.puppetlabs.net/artifactory/generic/buildsources/windows/chocolatey/install-chocolatey-1.4.0.ps1"
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe feature enable -n useFipsCompliantChecksums"

plat.add_build_repository "https://artifactory.delivery.puppetlabs.net/artifactory/api/nuget/nuget"

# We don't want to install any packages from the chocolatey repo by accident
plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe sources remove -name chocolatey"

#FIXME we need Fips Compliant Wix, currently not in choco repositories
#plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress"
plat.provision_with "curl -L -o /tmp/wix314-binaries.zip https://artifactory.delivery.puppetlabs.net/artifactory/generic__buildsources/buildsources/wix314-binaries.zip && 7z x -y -o\"/cygdrive/c/Program Files (x86)/WiX Toolset v3.14/bin\" /tmp/wix314-binaries.zip && rm /tmp/wix314-binaries.zip && SETX WIX \"C:\\Program Files (x86)\\WiX Toolset v3.14\" /M"
plat.provision_with "chmod -R 750 \"/cygdrive/c/Program Files (x86)/WiX Toolset v3.14/bin\""

plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress"

plat.make "/usr/bin/make"
plat.patch "TMP=/var/tmp /usr/bin/patch.exe --binary"

plat.platform_triple "x86_64-w64-mingw32"

plat.package_type "msi"
plat.output_dir "windowsfips"
end

0 comments on commit d56a340

Please sign in to comment.