[v2] Merge July 27th main into v2 feature branch

.ci/Jenkinsfile

@@ -50,7 +50,7 @@ pipeline {
         dir("${BASE_DIR}"){
           setEnvVar('ONLY_DOCS', isGitRegionMatch(patterns: [ '.*\\.(asciidoc|md)' ], shouldMatchAll: true).toString())
           setEnvVar('PACKAGING_CHANGES', isGitRegionMatch(patterns: [ '(^dev-tools/packaging/.*|.ci/Jenkinsfile)' ], shouldMatchAll: false).toString())
-          setEnvVar('K8S_CHANGES', isGitRegionMatch(patterns: [ '(^deploy/kubernetes/.*|^version/docs/version.asciidoc)' ], shouldMatchAll: false).toString())
+          setEnvVar('K8S_CHANGES', isGitRegionMatch(patterns: [ '(^deploy/kubernetes/.*|^version/docs/version.asciidoc|.ci/Jenkinsfile)' ], shouldMatchAll: false).toString())
         }
       }
     }
@@ -79,7 +79,7 @@ pipeline {
         axes {
           axis {
             name 'PLATFORM'
-            values 'ubuntu-20.04 && immutable', 'aarch64', 'windows-2016 && windows-immutable', 'windows-2022 && windows-immutable', 'darwin && orka && x86_64'
+            values 'ubuntu-20.04 && immutable', 'aws && aarch64', 'windows-2016 && windows-immutable', 'windows-2022 && windows-immutable', 'macos12 && x86_64'
           }
         }
         stages {
@@ -164,7 +164,7 @@ pipeline {
               }
             }
             environment {
-              ARCH = "${PLATFORM.equals('aarch64') ? 'arm64' : 'amd64'}"
+              ARCH = "${PLATFORM.contains('aarch64') ? 'arm64' : 'amd64'}"
               DEV = true
               EXTERNAL = true
             }
@@ -175,7 +175,7 @@ pipeline {
                 withMageEnv(){
                   dir("${BASE_DIR}"){
                     withPackageEnv("${PLATFORM}") {
-                      cmd(label: 'Go package', script: 'mage package')
+                      cmd(label: 'Go package', script: 'mage package ironbank')
                       uploadPackagesToGoogleBucket(
                         credentialsId: env.JOB_GCS_EXT_CREDENTIALS,
                         repo: env.REPO,
@@ -219,7 +219,7 @@ pipeline {
         axes {
           axis {
             name 'K8S_VERSION'
-            values "v1.24.0, v1.23.6, v1.22.9, v1.21.12"
+            values "v1.24.0", "v1.23.6", "v1.22.9", "v1.21.12"
           }
         }
         stages {
@@ -251,18 +251,23 @@ pipeline {
       }
       steps {
         // TODO: what's the testMatrixFile to be used if any
-        runE2E(testMatrixFile: '',
+        runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',
                beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",
                elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",
                gitHubCheckName: "e2e-tests",
                gitHubCheckRepo: env.REPO,
-               gitHubCheckSha1: env.GIT_BASE_COMMIT)
+               gitHubCheckSha1: env.GIT_BASE_COMMIT,
+               propagate: true,
+               wait: true)
       }
     }
   }
   post {
     cleanup {
-      notifyBuildResult(prComment: true)
+      notifyBuildResult(prComment: true,
+                        analyzeFlakey: !isTag(), jobName: getFlakyJobName(withBranch: (isPR() ? env.CHANGE_TARGET : env.BRANCH_NAME)),
+                        githubIssue: isBranch() && currentBuild.currentResult != "SUCCESS",
+                        githubLabels: 'Team:Elastic-Agent-Control-Plane')
     }
   }
 }
@@ -274,7 +279,7 @@ def isCodeCoverageEnabled() {
 
 def withPackageEnv(platform, Closure body) {
   if (isUnix()) {
-    if (platform.contains('macosx')) {
+    if (isDarwin()) {
       withPackageDarwinEnv() {
         body()
       }

.ci/jobs/elastic-agent-mbp.yml

@@ -2,7 +2,7 @@
 - job:
     name: "elastic-agent/elastic-agent-mbp"
     display-name: elastic-agent
-    description: "POC to isolate elastic agent from beats"
+    description: "Elastic agent"
     project-type: multibranch
     script-path: .ci/Jenkinsfile
     scm:
@@ -12,6 +12,7 @@
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current
           discover-tags: true
+          head-filter-regex: '(main|7\.17|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
           notification-context: 'fleet-ci'
           repo: elastic-agent
           repo-owner: elastic
@@ -39,4 +40,4 @@
             timeout: 100
           timeout: '15'
           use-author: true
-          wipe-workspace: 'True'
+          wipe-workspace: true

.github/CODEOWNERS

@@ -1,2 +1,4 @@
-# Team responsable for Fleet Server
+# Team responsible for Fleet Server
 * @elastic/elastic-agent-control-plane
+
+/deploy/kubernetes @elastic/obs-cloudnative-monitoring

.github/workflows/elastic-agent-project-board.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
-            mutation add_to_project($projectid:String!,$contentid:String!) {
+            mutation add_to_project($projectid:[ID!]!,$contentid:ID!) {
                updateIssue(input: {id:$contentid, projectIds:$projectid}) {
                 clientMutationId
               }

.github/workflows/golangci-lint.yml

@@ -14,18 +14,10 @@ jobs:
   golangci:
     strategy:
       matrix:
-        include:
-          - GOOS: windows
-          - GOOS: linux
-          - GOOS: darwin
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     name: lint
-    runs-on: ubuntu-latest
+    runs-on: ${{  matrix.os }}
     steps:
-      - name: Echo details
-        env:
-           GOOS: ${{ matrix.GOOS }}
-        run: echo Go GOOS=$GOOS
-
       - uses: actions/checkout@v2
 
       # Uses Go version from the repository.
@@ -38,8 +30,6 @@ jobs:
           go-version: "${{ steps.goversion.outputs.version }}"
 
       - name: golangci-lint
-        env:
-          GOOS: ${{ matrix.GOOS }}
         uses: golangci/golangci-lint-action@v2
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version

.gitignore

@@ -60,4 +60,3 @@ pkg/component/fake/fake
 
 # VSCode
 /.vscode
-

.mergify.yml

@@ -181,55 +181,42 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 8.0 branch
-    conditions:
-      - merged
-      - label=backport-v8.0.0
-    actions:
-      backport:
-        assignees:
-          - "{{ author }}"
-        branches:
-          - "8.0"
-        labels:
-          - "backport"
-        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 8.1 branch
+  - name: backport patches to 8.2 branch
     conditions:
       - merged
-      - label=backport-v8.1.0
+      - label=backport-v8.2.0
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
-          - "8.1"
+          - "8.2"
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 8.2 branch
+  - name: backport patches to 8.3 branch
     conditions:
       - merged
-      - label=backport-v8.2.0
+      - label=backport-v8.3.0
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
-          - "8.2"
+          - "8.3"
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 8.3 branch
+  - name: backport patches to 8.4 branch
     conditions:
       - merged
-      - label=backport-v8.3.0
+      - label=backport-v8.4.0
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
-          - "8.3"
+          - "8.4"
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"