Merge branch 'main' into otel-hybrid

Author: blakerouse

.buildkite/bk.integration.pipeline.yml

@@ -56,7 +56,6 @@ steps:
   - group: "Stateful(Sudo): Ubuntu"
     key: integration-tests-ubuntu
     depends_on:
-      - package-it
       - integration-ess
     steps:
       - label: "x86_64:Group: {{matrix}}"
@@ -71,6 +70,8 @@ steps:
           image: "family/platform-ingest-elastic-agent-ubuntu-2404"
         matrix:
           - default
+          - container
+          - fleet-upgrade-to-pr-build
           - upgrade
           - fleet
           - fqdn
@@ -88,9 +89,11 @@ steps:
         agents:
           provider: "aws"
           imagePrefix: "platform-ingest-beats-ubuntu-2404-aarch64"
-          instanceType: "m6g.xlarge"
+          instanceType: "m6g.2xlarge"
         matrix:
           - default
+          - container
+          - fleet-upgrade-to-pr-build
           - upgrade
           - fleet
           - fqdn
@@ -99,10 +102,28 @@ steps:
           - fleet-privileged
           - fleet-airgapped-privileged
 
+  - group: "Stateful(Sudo): RHEL8"
+    key: integration-tests-rhel8
+    depends_on:
+      - package-it
+      - integration-ess
+    steps:
+      - label: "x86_64:Group: rpm"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'package-it'
+          .buildkite/scripts/steps/integration_tests_tf_sudo.sh rpm
+        artifact_paths:
+          - build/**
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "family/platform-ingest-elastic-agent-rhel-8"
+
   - label: ESS stack cleanup
     depends_on:
       - integration-tests-ubuntu
       - integration-tests-win
+      - integration-tests-rhel8
     allow_dependency_failure: true
     command: |
       buildkite-agent artifact download "test_infra/ess/**" . --step "integration-ess"

.buildkite/pipeline.yml

@@ -13,6 +13,7 @@ steps:
     retry:
       manual:
         allowed: true
+
   - group: "Unit tests"
     key: "unit-tests"
     steps:
@@ -88,26 +89,27 @@ steps:
           manual:
             allowed: true
 
-      # Runs inly on the main branch
-      - label: "Unit tests - MacOS 13 ARM"
-        key: "unit-tests-macos-13-arm"
+  - group: "macOS tests"
+    key: "macos-unit-tests"
+    steps:
+      - label: "Unit tests - macOS 15 ARM"
         command: ".buildkite/scripts/steps/unit-tests.sh"
-        branches: main
         artifact_paths:
           - "build/TEST-*.html"
           - "build/TEST-*.xml"
           - "build/diagnostics/*"
           - "coverage-*.out"
         agents:
           provider: orka
-          imagePrefix: generic-13-ventura-arm
+          imagePrefix: generic-base-15-arm-002
         retry:
           manual:
             allowed: true
 
-      - label: "Unit tests - MacOS 13"
-        key: "unit-tests-macos-13"
+      # Runs only on main and release branches
+      - label: "Unit tests - macOS 13"
         command: ".buildkite/scripts/steps/unit-tests.sh"
+        branches: "main 8.* 9.*"
         artifact_paths:
           - "build/TEST-*.html"
           - "build/TEST-*.xml"
@@ -178,9 +180,7 @@ steps:
         allow_failure: true
       - step: "unit-tests-win2016"
         allow_failure: true
-      - step: "unit-tests-macos-13-arm"
-        allow_failure: true
-      - step: "unit-tests-macos-13"
+      - step: "macos-unit-tests"
         allow_failure: true
       - step: "unit-tests-win10"
         allow_failure: true

.buildkite/scripts/sudo-integration-tests.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
+# Fixes source asdf.sh, otherwise it relies on unexisting /root/.asdf directory
+export HOME=/opt/buildkite-agent
+
 # The script is used to run integration tests with sudo
-source /opt/buildkite-agent/hooks/pre-command 
+source /opt/buildkite-agent/hooks/pre-command
 source .buildkite/hooks/pre-command || echo "No pre-command hook found"
 
 # Make sure that all tools are installed

changelog/fragments/1731951823-Skip-notify-Fleet-on-Windows-uninstall.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: feature
+
+# Change summary; a 80ish characters long description of the change.
+summary: Skip notify Fleet on Windows uninstall
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component:
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/6065
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+issue: https://github.com/elastic/elastic-agent/issues/5952

internal/pkg/agent/install/uninstall.go

@@ -144,7 +144,9 @@ func Uninstall(ctx context.Context, cfgFile, topPath, uninstallToken string, log
 	}
 	pt.Describe("Removed install directory")
 
-	if notifyFleet {
+	// Skip on Windows because of https://github.com/elastic/elastic-agent/issues/5952
+	// Once the root-cause is identified then this can be re-enabled on Windows.
+	if notifyFleet && runtime.GOOS != "windows" {
 		notifyFleetAuditUninstall(ctx, log, pt, cfg, ai) //nolint:errcheck // ignore the error as we can't act on it
 	}
 

testing/integration/install_test.go

@@ -293,6 +293,15 @@ func TestInstallUninstallAudit(t *testing.T) {
 		Stack: &define.Stack{}, // needs a fleet-server.
 		Sudo:  true,
 		Local: false,
+		// Skip Windows as it has been disabled because of https://github.com/elastic/elastic-agent/issues/5952
+		OS: []define.OS{
+			{
+				Type: define.Linux,
+			},
+			{
+				Type: define.Darwin,
+			},
+		},
 	})
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))

testing/integration/logs_ingestion_test.go

@@ -208,6 +208,7 @@ func testMonitoringLogsAreShipped(
 			"add_cloud_metadata: received error for provider digitalocean: failed with http status code 404",
 			"add_cloud_metadata: received error for provider azure: failed with http status code 404",
 			"add_cloud_metadata: received error for provider openstack: failed with http status code 404",
+			"add_cloud_metadata: received error for provider gcp: failed with http status code 404",
 			"elastic-agent-client error: rpc error: code = Canceled desc = context canceled", // can happen on restart
 			"failed to invoke rollback watcher: failed to start Upgrade Watcher",             // on debian this happens probably need to fix.
 			"falling back to IMDSv1: operation error ec2imds: getToken",                      // okay for the cloud metadata to not work