diff --git a/build/goreleaser/linux/build_amd64.yml b/build/goreleaser/linux/build_amd64.yml index 135935d74..7039ba71d 100644 --- a/build/goreleaser/linux/build_amd64.yml +++ b/build/goreleaser/linux/build_amd64.yml @@ -1,10 +1,10 @@ + # build amd64 - id: linux-agent-amd64 main: ./cmd/newrelic-infra binary: newrelic-infra env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: @@ -18,8 +18,7 @@ main: ./cmd/newrelic-infra-ctl binary: newrelic-infra-ctl env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: @@ -33,8 +32,7 @@ main: ./cmd/newrelic-infra-service binary: newrelic-infra-service env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: diff --git a/build/goreleaser/linux/build_amd64_fips.yml b/build/goreleaser/linux/build_amd64_fips.yml new file mode 100644 index 000000000..135935d74 --- /dev/null +++ b/build/goreleaser/linux/build_amd64_fips.yml @@ -0,0 +1,46 @@ + # build amd64 + - id: linux-agent-amd64 + main: ./cmd/newrelic-infra + binary: newrelic-infra + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - amd64 + + - id: linux-ctl-amd64 + main: ./cmd/newrelic-infra-ctl + binary: newrelic-infra-ctl + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - amd64 + + - id: linux-service-amd64 + main: ./cmd/newrelic-infra-service + binary: newrelic-infra-service + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - amd64 + # end build amd64 diff --git a/build/goreleaser/linux/build_arm.yml b/build/goreleaser/linux/build_arm.yml index 8379edec2..c72e6ffcd 100644 --- a/build/goreleaser/linux/build_arm.yml +++ b/build/goreleaser/linux/build_arm.yml @@ -1,11 +1,10 @@ + # build arm - id: linux-agent-arm main: ./cmd/newrelic-infra binary: newrelic-infra env: - - CGO_ENABLED=1 - - CC=arm-linux-gnueabi-gcc - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: @@ -19,9 +18,7 @@ main: ./cmd/newrelic-infra-ctl binary: newrelic-infra-ctl env: - - CGO_ENABLED=1 - - CC=arm-linux-gnueabi-gcc - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: @@ -35,9 +32,7 @@ main: ./cmd/newrelic-infra-service binary: newrelic-infra-service env: - - CGO_ENABLED=1 - - CC=arm-linux-gnueabi-gcc - - GOEXPERIMENT=boringcrypto + - CGO_ENABLED=0 goos: - linux ldflags: diff --git a/build/goreleaser/linux/build_arm64.yml b/build/goreleaser/linux/build_arm64.yml index e8ca1f787..008ffb248 100644 --- a/build/goreleaser/linux/build_arm64.yml +++ b/build/goreleaser/linux/build_arm64.yml @@ -3,9 +3,7 @@ main: ./cmd/newrelic-infra binary: newrelic-infra env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto - - CC=aarch64-linux-gnu-gcc + - CGO_ENABLED=0 goos: - linux ldflags: @@ -19,9 +17,7 @@ main: ./cmd/newrelic-infra-ctl binary: newrelic-infra-ctl env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto - - CC=aarch64-linux-gnu-gcc + - CGO_ENABLED=0 goos: - linux ldflags: @@ -35,9 +31,7 @@ main: ./cmd/newrelic-infra-service binary: newrelic-infra-service env: - - CGO_ENABLED=1 - - GOEXPERIMENT=boringcrypto - - CC=aarch64-linux-gnu-gcc + - CGO_ENABLED=0 goos: - linux ldflags: @@ -46,4 +40,4 @@ - -s -w -X main.buildDate={{.Date}} goarch: - arm64 - # end build arm64 + # end build arm64 \ No newline at end of file diff --git a/build/goreleaser/linux/build_arm64_fips.yml b/build/goreleaser/linux/build_arm64_fips.yml new file mode 100644 index 000000000..e8ca1f787 --- /dev/null +++ b/build/goreleaser/linux/build_arm64_fips.yml @@ -0,0 +1,49 @@ + # build arm64 + - id: linux-agent-arm64 + main: ./cmd/newrelic-infra + binary: newrelic-infra + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + - CC=aarch64-linux-gnu-gcc + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - arm64 + + - id: linux-ctl-arm64 + main: ./cmd/newrelic-infra-ctl + binary: newrelic-infra-ctl + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + - CC=aarch64-linux-gnu-gcc + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - arm64 + + - id: linux-service-arm64 + main: ./cmd/newrelic-infra-service + binary: newrelic-infra-service + env: + - CGO_ENABLED=1 + - GOEXPERIMENT=boringcrypto + - CC=aarch64-linux-gnu-gcc + goos: + - linux + ldflags: + - -s -w -X main.buildVersion={{.Version}} + - -s -w -X main.gitCommit={{.Commit}} + - -s -w -X main.buildDate={{.Date}} + goarch: + - arm64 + # end build arm64 diff --git a/build/release.mk b/build/release.mk index 0fee79c7e..e0ecb2358 100644 --- a/build/release.mk +++ b/build/release.mk @@ -138,6 +138,11 @@ release/sign: @echo "=== [release/sign] signing packages" @bash $(CURDIR)/build/sign.sh +.PHONY : release/sign-fips +release/sign: + @echo "=== [release/sign] signing packages" + @bash $(CURDIR)/build/sign_fips.sh + .PHONY : release-publish release-publish: @echo "=== [release/publish] publishing artifacts" @@ -147,6 +152,10 @@ release-publish: release-linux: release/pkg-linux release/fix-tarballs-linux release/sign @echo "=== [release-linux] full pre-release cycle complete for nix" +.PHONY : release-linux-fips +release-linux: release/pkg-linux-fips release/fix-tarballs-linux release/sign-fips + @echo "=== [release-linux] full pre-release cycle complete for nix - FIPS" + .PHONY : release-linux-amd64 release-linux-amd64: release/pkg-linux-amd64 release/fix-tarballs-linux release/sign @echo "=== [release-linux-amd64] full pre-release cycle complete for nix" @@ -265,10 +274,12 @@ generate-goreleaser-multiarch: $(CURDIR)/build/goreleaser/linux/build_amd64.yml\ $(CURDIR)/build/goreleaser/linux/build_arm.yml\ $(CURDIR)/build/goreleaser/linux/build_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/build_legacy.yml\ $(CURDIR)/build/goreleaser/linux/archives_header.yml\ $(CURDIR)/build/goreleaser/linux/archives_amd64.yml\ $(CURDIR)/build/goreleaser/linux/archives_arm.yml\ $(CURDIR)/build/goreleaser/linux/archives_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/archives_legacy.yml\ $(CURDIR)/build/goreleaser/linux/nfpms_header.yml\ $(CURDIR)/build/goreleaser/linux/al2023_amd64.yml\ $(CURDIR)/build/goreleaser/linux/al2023_arm.yml\ @@ -290,47 +301,61 @@ generate-goreleaser-multiarch: $(CURDIR)/build/goreleaser/linux/debian_systemd_arm.yml\ $(CURDIR)/build/goreleaser/linux/debian_systemd_arm64.yml\ $(CURDIR)/build/goreleaser/linux/debian_upstart_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_114_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_121_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_122_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_122_arm.yml\ + $(CURDIR)/build/goreleaser/linux/sles_122_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_123_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_123_arm.yml\ + $(CURDIR)/build/goreleaser/linux/sles_123_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_124_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_124_arm.yml\ + $(CURDIR)/build/goreleaser/linux/sles_124_arm64.yml\ $(CURDIR)/build/goreleaser/linux/sles_125_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_125_arm.yml\ $(CURDIR)/build/goreleaser/linux/sles_125_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_151_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_151_arm.yml\ + $(CURDIR)/build/goreleaser/linux/sles_151_arm64.yml\ $(CURDIR)/build/goreleaser/linux/sles_152_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_152_arm.yml\ $(CURDIR)/build/goreleaser/linux/sles_152_arm64.yml\ $(CURDIR)/build/goreleaser/linux/sles_153_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_153_arm.yml\ $(CURDIR)/build/goreleaser/linux/sles_153_arm64.yml\ $(CURDIR)/build/goreleaser/linux/sles_154_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_154_arm.yml\ $(CURDIR)/build/goreleaser/linux/sles_154_arm64.yml\ $(CURDIR)/build/goreleaser/linux/sles_155_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_155_arm.yml\ $(CURDIR)/build/goreleaser/linux/sles_155_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_156_amd64.yml\ + $(CURDIR)/build/goreleaser/linux/sles_156_arm.yml\ + $(CURDIR)/build/goreleaser/linux/sles_156_arm64.yml\ > $(GORELEASER_CONFIG_LINUX) .PHONY : generate-goreleaser-multiarch-fips generate-goreleaser-multiarch-fips: cat $(CURDIR)/build/goreleaser/linux/header.yml\ - $(CURDIR)/build/goreleaser/linux/build_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/build_arm.yml\ - $(CURDIR)/build/goreleaser/linux/build_arm64.yml\ + $(CURDIR)/build/goreleaser/linux/build_amd64_fips.yml\ + $(CURDIR)/build/goreleaser/linux/build_arm64_fips.yml\ $(CURDIR)/build/goreleaser/linux/archives_header.yml\ $(CURDIR)/build/goreleaser/linux/archives_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/archives_arm.yml\ $(CURDIR)/build/goreleaser/linux/archives_arm64.yml\ $(CURDIR)/build/goreleaser/linux/nfpms_header.yml\ $(CURDIR)/build/goreleaser/linux/al2023_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/al2023_arm.yml\ $(CURDIR)/build/goreleaser/linux/al2023_arm64.yml\ $(CURDIR)/build/goreleaser/linux/al2_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/al2_arm.yml\ $(CURDIR)/build/goreleaser/linux/al2_arm64.yml\ $(CURDIR)/build/goreleaser/linux/centos_6_amd64.yml\ $(CURDIR)/build/goreleaser/linux/centos_7_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/centos_7_arm.yml\ $(CURDIR)/build/goreleaser/linux/centos_7_arm64.yml\ $(CURDIR)/build/goreleaser/linux/centos_8_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/centos_8_arm.yml\ $(CURDIR)/build/goreleaser/linux/centos_8_arm64.yml\ $(CURDIR)/build/goreleaser/linux/rhel_9_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/rhel_9_arm.yml\ $(CURDIR)/build/goreleaser/linux/rhel_9_arm64.yml\ $(CURDIR)/build/goreleaser/linux/debian_systemd_amd64.yml\ - $(CURDIR)/build/goreleaser/linux/debian_systemd_arm.yml\ $(CURDIR)/build/goreleaser/linux/debian_systemd_arm64.yml\ $(CURDIR)/build/goreleaser/linux/debian_upstart_amd64.yml\ $(CURDIR)/build/goreleaser/linux/sles_125_amd64.yml\ diff --git a/build/sign.sh b/build/sign.sh index c68d08b68..78a82c5ba 100644 --- a/build/sign.sh +++ b/build/sign.sh @@ -7,20 +7,6 @@ set -e # # # -# Function to start gpg-agent if not running -start_gpg_agent() { - if ! pgrep -x "gpg-agent" > /dev/null - then - echo "Starting gpg-agent..." - eval $(gpg-agent --daemon) - else - echo "gpg-agent is already running." - fi -} - -# Ensure gpg-agent is running -start_gpg_agent - # Sign RPM's echo "===> Create .rpmmacros to sign rpm's from Goreleaser" @@ -28,7 +14,7 @@ echo "%_gpg_name ${GPG_MAIL}" >> ~/.rpmmacros echo "%_signature gpg" >> ~/.rpmmacros echo "%_gpg_path /root/.gnupg" >> ~/.rpmmacros echo "%_gpgbin /usr/bin/gpg" >> ~/.rpmmacros -echo "%__gpg_sign_cmd %{__gpg} gpg --no-verbose --no-armor --passphrase ${GPG_PASSPHRASE} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}" >> ~/.rpmmacros +echo "%__gpg_sign_cmd %{__gpg} gpg --no-verbose --no-armor --batch --pinentry-mode loopback --passphrase ${GPG_PASSPHRASE} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}" >> ~/.rpmmacros echo "===> Importing GPG private key from GHA secrets..." printf %s ${GPG_PRIVATE_KEY_BASE64} | base64 -d | gpg --batch --import - @@ -44,47 +30,35 @@ sles_regex="(.*sles12.*)" for rpm_file in $(find -regex ".*\.\(rpm\)");do echo "===> Signing $rpm_file" - ../build/sign.exp $rpm_file ${GPG_PASSPHRASE} + # if suse 12.x, then add --rpmv3 + if [[ $rpm_file =~ $sles_regex ]]; then + rpmsign --addsign --rpmv3 $rpm_file + else + rpmsign --addsign $rpm_file + fi echo "===> Sign verification $rpm_file" rpm -v --checksig $rpm_file done -# Make sure the sign_deb.exp script is executable -chmod +x ../build/sign_deb.exp - # Sign DEB's GNUPGHOME="/root/.gnupg" echo "${GPG_PASSPHRASE}" > "${GNUPGHOME}/gpg-passphrase" echo "passphrase-file ${GNUPGHOME}/gpg-passphrase" >> "$GNUPGHOME/gpg.conf" -# echo 'allow-loopback-pinentry' >> "${GNUPGHOME}/gpg-agent.conf" -# echo 'pinentry-mode loopback' >> "${GNUPGHOME}/gpg.conf" +echo 'allow-loopback-pinentry' >> "${GNUPGHOME}/gpg-agent.conf" +echo 'pinentry-mode loopback' >> "${GNUPGHOME}/gpg.conf" echo 'use-agent' >> "${GNUPGHOME}/gpg.conf" echo RELOADAGENT | gpg-connect-agent -for deb_file in $(find -regex ".*\.\(deb\)"); do +for deb_file in $(find -regex ".*\.\(deb\)");do echo "===> Signing $deb_file" - - # Run the sign_deb.exp script to sign the .deb file -../build/sign_deb.exp $deb_file ${GPG_PASSPHRASE} ${GPG_MAIL} - - - echo "===> Sign verification $deb_file" - dpkg-sig --verify $deb_file + debsigs --sign=origin --verify --check -v -k ${GPG_MAIL} $deb_file done -# Make sure the sign_tar.exp script is executable -chmod +x ../build/sign_tar.exp - # Sign TARGZ files -for targz_file in $(find . -type f -name "*.tar.gz"); do +for targz_file in $(find -regex ".*\.\(tar.gz\)");do echo "===> Signing $targz_file" - ../build/sign_tar.exp $targz_file ${GPG_PASSPHRASE} - asc_file="${targz_file}.asc" - if [ -f "$asc_file" ]; then - echo "===> Sign verification $targz_file" - gpg --verify "$asc_file" "$targz_file" - else - echo "Error: Signature file $asc_file not found." - fi + gpg --sign --armor --detach-sig $targz_file + echo "===> Sign verification $targz_file" + gpg --verify ${targz_file}.asc $targz_file done \ No newline at end of file diff --git a/build/sign_deb.exp b/build/sign_deb_fips.exp similarity index 100% rename from build/sign_deb.exp rename to build/sign_deb_fips.exp diff --git a/build/sign_fips.sh b/build/sign_fips.sh new file mode 100644 index 000000000..dbbbe8a2e --- /dev/null +++ b/build/sign_fips.sh @@ -0,0 +1,90 @@ +#!/usr/bin/env sh +set -e +# +# +# +# Sign RPM's & DEB's in /dist artifacts to GH Release Assets +# +# +# +# Function to start gpg-agent if not running +start_gpg_agent() { + if ! pgrep -x "gpg-agent" > /dev/null + then + echo "Starting gpg-agent..." + eval $(gpg-agent --daemon) + else + echo "gpg-agent is already running." + fi +} + +# Ensure gpg-agent is running +start_gpg_agent + + +# Sign RPM's +echo "===> Create .rpmmacros to sign rpm's from Goreleaser" +echo "%_gpg_name ${GPG_MAIL}" >> ~/.rpmmacros +echo "%_signature gpg" >> ~/.rpmmacros +echo "%_gpg_path /root/.gnupg" >> ~/.rpmmacros +echo "%_gpgbin /usr/bin/gpg" >> ~/.rpmmacros +echo "%__gpg_sign_cmd %{__gpg} gpg --no-verbose --no-armor --passphrase ${GPG_PASSPHRASE} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}" >> ~/.rpmmacros + +echo "===> Importing GPG private key from GHA secrets..." +printf %s ${GPG_PRIVATE_KEY_BASE64} | base64 -d | gpg --batch --import - + +echo "===> Importing GPG signature, needed from Goreleaser to verify signature" +gpg --export -a ${GPG_MAIL} > /tmp/RPM-GPG-KEY-${GPG_MAIL} +rpm --import /tmp/RPM-GPG-KEY-${GPG_MAIL} + +cd dist + +sles_regex="(.*sles12.*)" + +for rpm_file in $(find -regex ".*\.\(rpm\)");do + echo "===> Signing $rpm_file" + + ../build/sign_rpm_fips.exp $rpm_file ${GPG_PASSPHRASE} + + echo "===> Sign verification $rpm_file" + rpm -v --checksig $rpm_file +done + +# Make sure the sign_deb.exp script is executable +chmod +x ../build/sign_deb_fips.exp + +# Sign DEB's +GNUPGHOME="/root/.gnupg" +echo "${GPG_PASSPHRASE}" > "${GNUPGHOME}/gpg-passphrase" +echo "passphrase-file ${GNUPGHOME}/gpg-passphrase" >> "$GNUPGHOME/gpg.conf" +# echo 'allow-loopback-pinentry' >> "${GNUPGHOME}/gpg-agent.conf" +# echo 'pinentry-mode loopback' >> "${GNUPGHOME}/gpg.conf" +echo 'use-agent' >> "${GNUPGHOME}/gpg.conf" +echo RELOADAGENT | gpg-connect-agent + +for deb_file in $(find -regex ".*\.\(deb\)"); do + echo "===> Signing $deb_file" + + # Run the sign_deb.exp script to sign the .deb file +../build/sign_deb_fips.exp $deb_file ${GPG_PASSPHRASE} ${GPG_MAIL} + + + echo "===> Sign verification $deb_file" + dpkg-sig --verify $deb_file +done + +# Make sure the sign_tar.exp script is executable +chmod +x ../build/sign_tar_fips.exp + +# Sign TARGZ files +for targz_file in $(find . -type f -name "*.tar.gz"); do + echo "===> Signing $targz_file" + ../build/sign_tar.exp $targz_file ${GPG_PASSPHRASE} + asc_file="${targz_file}.asc" + if [ -f "$asc_file" ]; then + echo "===> Sign verification $targz_file" + gpg --verify "$asc_file" "$targz_file" + else + echo "Error: Signature file $asc_file not found." + fi +done \ No newline at end of file diff --git a/build/sign.exp b/build/sign_rpm_fips.exp similarity index 100% rename from build/sign.exp rename to build/sign_rpm_fips.exp diff --git a/build/sign_tar.exp b/build/sign_tar_fips.exp similarity index 100% rename from build/sign_tar.exp rename to build/sign_tar_fips.exp diff --git a/build/upload-schema-linux-deb-fips.yml b/build/upload-schema-linux-deb-fips.yml index 286cf6cd9..0585da490 100644 --- a/build/upload-schema-linux-deb-fips.yml +++ b/build/upload-schema-linux-deb-fips.yml @@ -3,7 +3,7 @@ arch: - amd64 - arm64 - - arm + # - arm uploads: - type: apt src_repo: "{access_point_host}/infrastructure_agent/linux/apt" @@ -41,7 +41,7 @@ arch: - amd64 - arm64 - - arm + # - arm uploads: - type: file dest: "{dest_prefix}linux/apt/pool/main/n/newrelic-infra/{src}" diff --git a/build/upload-schema-linux-deb.yml b/build/upload-schema-linux-deb.yml index 286cf6cd9..65034b80b 100644 --- a/build/upload-schema-linux-deb.yml +++ b/build/upload-schema-linux-deb.yml @@ -1,5 +1,5 @@ --- -- src: "newrelic-infra_systemd_{version}_{arch}_fips.deb" +- src: "newrelic-infra_systemd_{version}_{arch}.deb" arch: - amd64 - arm64 @@ -22,7 +22,7 @@ - bullseye - bookworm -- src: "newrelic-infra_upstart_{version}_{arch}_fips.deb" +- src: "newrelic-infra_upstart_{version}_{arch}.deb" arch: - amd64 uploads: @@ -37,7 +37,7 @@ # UPLOAD CHECKSUMS # ######################### -- src: "newrelic-infra_systemd_{version}_{arch}_fips.deb.sum" +- src: "newrelic-infra_systemd_{version}_{arch}.deb.sum" arch: - amd64 - arm64 @@ -45,7 +45,7 @@ uploads: - type: file dest: "{dest_prefix}linux/apt/pool/main/n/newrelic-infra/{src}" -- src: "newrelic-infra_upstart_{version}_{arch}_fips.deb.sum" +- src: "newrelic-infra_upstart_{version}_{arch}.deb.sum" arch: - amd64 uploads: diff --git a/build/upload-schema-linux-rpm-fips.yml b/build/upload-schema-linux-rpm-fips.yml index be26c3472..0501632c7 100644 --- a/build/upload-schema-linux-rpm-fips.yml +++ b/build/upload-schema-linux-rpm-fips.yml @@ -13,7 +13,7 @@ - src: "newrelic-infra-{version}-1.el{os_version}.{arch}.rpm" arch: - - arm + # - arm - arm64 uploads: - type: yum @@ -88,16 +88,16 @@ - 8 - 9 -- src: "newrelic-infra-{version}-1.el{os_version}.{arch}.rpm.sum" - arch: - - arm - uploads: - - type: file - dest: "{dest_prefix}linux/yum/el/{os_version}/{arch}/{src}" - os_version: - - 7 - - 8 - - 9 +# - src: "newrelic-infra-{version}-1.el{os_version}.{arch}.rpm.sum" +# arch: +# - arm +# uploads: +# - type: file +# dest: "{dest_prefix}linux/yum/el/{os_version}/{arch}/{src}" +# os_version: +# - 7 +# - 8 +# - 9 - src: "newrelic-infra-{version}-1.el{os_version}.{arch}.rpm.sum" arch: @@ -166,7 +166,7 @@ - src: "newrelic-infra-{version}-1.amazonlinux-{os_version}.{arch}.rpm.sum" arch: - x86_64 - - arm + # - arm uploads: - type: file dest: "{dest_prefix}linux/yum/amazonlinux/{os_version}/{arch}/{src}" diff --git a/build/upload-schema-linux-rpm.yml b/build/upload-schema-linux-rpm.yml index be26c3472..9890cb0fb 100644 --- a/build/upload-schema-linux-rpm.yml +++ b/build/upload-schema-linux-rpm.yml @@ -30,35 +30,37 @@ - type: zypp dest: "{dest_prefix}linux/zypp/sles/{os_version}/{arch}/" os_version: - # - 11.4 - # - 12.1 - # - 12.2 - # - 12.3 - # - 12.4 + - 11.4 + - 12.1 + - 12.2 + - 12.3 + - 12.4 - 12.5 - # - 15.1 + - 15.1 - 15.2 - 15.3 - 15.4 - 15.5 + - 15.6 - src: "newrelic-infra-{version}-1.sles{os_version}.{arch}.rpm" arch: - # - arm + - arm - arm64 uploads: - type: zypp dest: "{dest_prefix}linux/zypp/sles/{os_version}/{arch}/" os_version: - # - 12.2 - # - 12.3 - # - 12.4 + - 12.2 + - 12.3 + - 12.4 - 12.5 - # - 15.1 + - 15.1 - 15.2 - 15.3 - 15.4 - 15.5 + - 15.6 - src: "newrelic-infra-{version}-1.amazonlinux-{os_version}.{arch}.rpm" arch: @@ -117,34 +119,36 @@ - type: file dest: "{dest_prefix}linux/zypp/sles/{os_version}/{arch}/{src}" os_version: - # - 11.4 - # - 12.1 - # - 12.2 - # - 12.3 - # - 12.4 + - 11.4 + - 12.1 + - 12.2 + - 12.3 + - 12.4 - 12.5 - # - 15.1 + - 15.1 - 15.2 - 15.3 - 15.4 - 15.5 + - 15.6 -# - src: "newrelic-infra-{version}-1.sles{os_version}.{arch}.rpm.sum" -# arch: -# - arm -# uploads: -# - type: file -# dest: "{dest_prefix}linux/zypp/sles/{os_version}/{arch}/{src}" -# os_version: -# - 12.2 -# - 12.3 -# - 12.4 -# - 12.5 -# - 15.1 -# - 15.2 -# - 15.3 -# - 15.4 -# - 15.5 +- src: "newrelic-infra-{version}-1.sles{os_version}.{arch}.rpm.sum" + arch: + - arm + uploads: + - type: file + dest: "{dest_prefix}linux/zypp/sles/{os_version}/{arch}/{src}" + os_version: + - 12.2 + - 12.3 + - 12.4 + - 12.5 + - 15.1 + - 15.2 + - 15.3 + - 15.4 + - 15.5 + - 15.6 - src: "newrelic-infra-{version}-1.sles{os_version}.{arch}.rpm.sum" arch: @@ -153,15 +157,16 @@ - type: file dest: "{dest_prefix}linux/zypp/sles/{os_version}/aarch64/{src}" os_version: - # - 12.2 - # - 12.3 - # - 12.4 + - 12.2 + - 12.3 + - 12.4 - 12.5 - # - 15.1 + - 15.1 - 15.2 - 15.3 - 15.4 - 15.5 + - 15.6 - src: "newrelic-infra-{version}-1.amazonlinux-{os_version}.{arch}.rpm.sum" arch: diff --git a/build/upload-schema-linux-targz.yml b/build/upload-schema-linux-targz.yml index 7f1b966ba..f1d82498f 100644 --- a/build/upload-schema-linux-targz.yml +++ b/build/upload-schema-linux-targz.yml @@ -4,16 +4,16 @@ - type: file dest: "{dest_prefix}binaries/linux/{arch}/{src}" arch: - # - 386 + - 386 - amd64 - # - arm + - arm - arm64 - # - mips - # - mips64 - # - mips64le - # - mipsle - # - ppc64le - # - s390x + - mips + - mips64 + - mips64le + - mipsle + - ppc64le + - s390x ######################### # UPLOAD CHECKSUMS # @@ -24,16 +24,16 @@ - type: file dest: "{dest_prefix}binaries/linux/{arch}/{src}" arch: - # - 386 + - 386 - amd64 - # - arm + - arm - arm64 - # - mips - # - mips64 - # - mips64le - # - mipsle - # - ppc64le - # - s390x + - mips + - mips64 + - mips64le + - mipsle + - ppc64le + - s390x ######################### # UPLOAD SIGNATURE # @@ -44,13 +44,13 @@ - type: file dest: "{dest_prefix}binaries/linux/{arch}/{src}" arch: - # - 386 + - 386 - amd64 - # - arm + - arm - arm64 - # - mips - # - mips64 - # - mips64le - # - mipsle - # - ppc64le - # - s390x + - mips + - mips64 + - mips64le + - mipsle + - ppc64le + - s390x