From 4b523bc6aee8d0f0fd10ee5a41a665344894e638 Mon Sep 17 00:00:00 2001 From: Lucas Manuel Rodriguez Date: Thu, 16 Jan 2025 13:07:09 -0300 Subject: [PATCH] Add support for universal binary on test migration script (#25483) --- tools/tuf/test/migration/migration_test.sh | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/tuf/test/migration/migration_test.sh b/tools/tuf/test/migration/migration_test.sh index c6190a172b..47b5d56d2b 100755 --- a/tools/tuf/test/migration/migration_test.sh +++ b/tools/tuf/test/migration/migration_test.sh @@ -166,12 +166,20 @@ TUF_PORT=$NEW_TUF_PORT TUF_PATH=$NEW_TUF_PATH ./tools/tuf/test/run_server.sh echo "Building the new orbit that will perform the migration..." ROOT_KEYS2=$(./build/fleetctl updates roots --path $NEW_TUF_PATH) CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build \ - -o orbit-darwin \ + -o orbit-darwin-amd64 \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_FULL_VERSION \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ ./orbit/cmd/orbit +CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build \ + -o orbit-darwin-arm64 \ + -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_FULL_VERSION \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ + ./orbit/cmd/orbit +lipo -create orbit-darwin-amd64 orbit-darwin-arm64 -output orbit-darwin CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ -o orbit-linux \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_FULL_VERSION \ @@ -245,12 +253,20 @@ if [ "$SIMULATE_NEW_TUF_OUTAGE" = "1" ]; then echo "Build and push a new update to orbit to old and new repository (to test patching an invalid 1.38.0 would work for customers without access to new TUF)" ROOT_KEYS2=$(./build/fleetctl updates roots --path $NEW_TUF_PATH) CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build \ - -o orbit-darwin \ + -o orbit-darwin-amd64 \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ ./orbit/cmd/orbit + CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build \ + -o orbit-darwin-arm64 \ + -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ + ./orbit/cmd/orbit + lipo -create orbit-darwin-amd64 orbit-darwin-arm64 -output orbit-darwin CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ -o orbit-linux \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \ @@ -321,12 +337,20 @@ done echo "Building and pushing a new update to orbit on the new repository (to test upgrades are working)..." ROOT_KEYS2=$(./build/fleetctl updates roots --path $NEW_TUF_PATH) CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build \ - -o orbit-darwin \ + -o orbit-darwin-amd64 \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ ./orbit/cmd/orbit +CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build \ + -o orbit-darwin-arm64 \ + -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \ + -X github.com/fleetdm/fleet/v4/orbit/pkg/update.OldFleetTUFURL=$OLD_TUF_URL" \ + ./orbit/cmd/orbit +lipo -create orbit-darwin-amd64 orbit-darwin-arm64 -output orbit-darwin CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ -o orbit-linux \ -ldflags="-X github.com/fleetdm/fleet/v4/orbit/pkg/build.Version=$NEW_PATCH_VERSION \