Merge branch '8.16' into mergify/bp/8.16/pr-6030

.buildkite/pipeline.yml

@@ -160,7 +160,7 @@ steps:
   - label: ":junit: Junit annotate"
     plugins:
       - junit-annotate#v2.5.0:
-          artifacts: "build/*.xml"
+          artifacts: "**TEST-*.xml"
           always-annotate: true
     agents:
       provider: "gcp"
@@ -188,7 +188,7 @@ steps:
     command: |
       .buildkite/scripts/steps/merge.sh
     artifact_paths:
-      - "TEST-go-unit.cov"
+      - "build/TEST-go-unit.cov"
     agents:
       image: "golang:1.22.6"
     depends_on:
@@ -225,7 +225,7 @@ steps:
     agents:
       image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
     command:
-      - "buildkite-agent artifact download --step merge-coverage TEST-go-unit.cov ."
+      - "buildkite-agent artifact download --step merge-coverage build/TEST-go-unit.cov ."
       - "/scan-source-code.sh"
     depends_on:
       - "merge-coverage"

.buildkite/scripts/steps/merge.sh

@@ -5,7 +5,8 @@
 set -euo pipefail
 set -x # for debugging
 
-MERGED_COV_FILE="TEST-go-unit.cov"
+mkdir -p build
+MERGED_COV_FILE="build/TEST-go-unit.cov"
 
 go install github.com/wadey/gocovmerge@latest
 

.github/CODEOWNERS

@@ -1,15 +1,16 @@
 # Team responsible for Fleet Server
 * @elastic/elastic-agent-control-plane
 
-/.github/CODEOWNERS @elastic/ingest-tech-lead
-
-/deploy/kubernetes @elastic/obs-cloudnative-monitoring
-/dev-tools/kubernetes @elastic/obs-cloudnative-monitoring
-/internal/pkg/composable/providers/kubernetes @elastic/obs-cloudnative-monitoring
-/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat
+# Top-level files ownership
+/catalog-info.yaml @elastic/ingest-eng-prod
 
-# Ownership of CI or related files by the Ingest Eng Prod team
+# Sub-directories/files ownership. Remember that order matters; the last matching pattern takes the most precedence.
 /.buildkite @elastic/ingest-eng-prod
 /.ci @elastic/ingest-eng-prod
 /.github @elastic/ingest-eng-prod
-/catalog-info.yaml @elastic/ingest-eng-prod
+/.github/CODEOWNERS @elastic/ingest-tech-lead
+/deploy/helm @elastic/elastic-agent-control-plane
+/deploy/kubernetes @elastic/elastic-agent-control-plane
+/dev-tools/kubernetes @elastic/elastic-agent-control-plane
+/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat
+/internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane

.github/workflows/bump-agent-versions.sh

@@ -8,28 +8,31 @@ if [ -z "$changes" ]
 then
     echo "The version files didn't change, skipping..."
 else
+		# because this script is running on the matrix, we need to fetch the current branch on every run
+		current_ref=$(git rev-parse --abbrev-ref HEAD)
     echo "The version file(s) changed"
     git diff -p
-    open=$(gh pr list --repo "$GITHUB_REPOSITORY" --label="update-versions" --limit 1 --state open --base "$GITHUB_REF_NAME")
+    open=$(gh pr list --repo "$GITHUB_REPOSITORY" --label="update-versions" --limit 1 --state open --base "$current_ref")
     if [ -n "$open" ]
     then
-        echo "Another PR for $GITHUB_REF_NAME is in review, skipping..."
+        echo "Another PR for $current_ref is in review, skipping..."
         exit 0
     fi
+    pr_branch="update/$current_ref-update-agent-versions-$GITHUB_RUN_ID"
     # the mage target above requires to be on a release branch
     # so, the new branch should not be created before the target is run
-    git checkout -b update-agent-versions-$GITHUB_RUN_ID
+    git checkout -b "$pr_branch"
     git add testing/integration/testdata/.upgrade-test-agent-versions.yml .package-version
 
     nl=$'\n' # otherwise the new line character is not recognized properly
     commit_desc="These files are used for picking the starting (pre-upgrade) or ending (post-upgrade) agent versions in upgrade integration tests.${nl}${nl}The content is based on responses from https://www.elastic.co/api/product_versions and https://snapshots.elastic.co${nl}${nl}The current update is generated based on the following requirements:${nl}${nl}Package version: ${package_version}${nl}${nl}\`\`\`json${nl}${version_requirements}${nl}\`\`\`"
 
-    git commit -m "[$GITHUB_REF_NAME][Automation] Update versions" -m "$commit_desc"
-    git push --set-upstream origin "update-agent-versions-$GITHUB_RUN_ID"
+    git commit -m "[$current_ref][Automation] Update versions" -m "$commit_desc"
+    git push --set-upstream origin "$pr_branch"
     pr=$(gh pr create \
-       --base "$GITHUB_REF_NAME" \
+       --base "$current_ref" \
        --fill-first \
-       --head "update-agent-versions-$GITHUB_RUN_ID" \
+       --head "$pr_branch" \
        --label 'Team:Elastic-Agent' \
        --label 'Team:Elastic-Agent-Control-Plane' \
        --label 'update-versions' \

.package-version

@@ -1 +1 @@
-8.16.0
+8.16.3