elastic
diff --git a/‎.ci/Jenkinsfile‎
Lines changed: 14 additions & 9 deletions b/‎.ci/Jenkinsfile‎
Lines changed: 14 additions & 9 deletions
diff --git a/‎.ci/jobs/elastic-agent-mbp.yml‎
Lines changed: 3 additions & 2 deletions b/‎.ci/jobs/elastic-agent-mbp.yml‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎.github/CODEOWNERS‎
Lines changed: 3 additions & 1 deletion b/‎.github/CODEOWNERS‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.github/workflows/elastic-agent-project-board.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/elastic-agent-project-board.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/golangci-lint.yml‎
Lines changed: 2 additions & 12 deletions b/‎.github/workflows/golangci-lint.yml‎
Lines changed: 2 additions & 12 deletions
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 1 deletion b/‎.gitignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.mergify.yml‎
Lines changed: 9 additions & 22 deletions b/‎.mergify.yml‎
Lines changed: 9 additions & 22 deletions
@@ -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()
       }
 
@@ -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
@@ -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
@@ -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
               }
 
@@ -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
 
@@ -60,4 +60,3 @@ pkg/component/fake/fake
 
 # VSCode
 /.vscode
-
@@ -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 }}"
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ pipeline {`
`50`	`50`	`dir("${BASE_DIR}"){`
`51`	`51`	`setEnvVar('ONLY_DOCS', isGitRegionMatch(patterns: [ '.*\\.(asciidoc\|md)' ], shouldMatchAll: true).toString())`
`52`	`52`	`setEnvVar('PACKAGING_CHANGES', isGitRegionMatch(patterns: [ '(^dev-tools/packaging/.*\|.ci/Jenkinsfile)' ], shouldMatchAll: false).toString())`
`53`		`- setEnvVar('K8S_CHANGES', isGitRegionMatch(patterns: [ '(^deploy/kubernetes/.*\|^version/docs/version.asciidoc)' ], shouldMatchAll: false).toString())`
	`53`	`+ setEnvVar('K8S_CHANGES', isGitRegionMatch(patterns: [ '(^deploy/kubernetes/.*\|^version/docs/version.asciidoc\|.ci/Jenkinsfile)' ], shouldMatchAll: false).toString())`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -79,7 +79,7 @@ pipeline {`
`79`	`79`	`axes {`
`80`	`80`	`axis {`
`81`	`81`	`name 'PLATFORM'`
`82`		`- values 'ubuntu-20.04 && immutable', 'aarch64', 'windows-2016 && windows-immutable', 'windows-2022 && windows-immutable', 'darwin && orka && x86_64'`
	`82`	`+ values 'ubuntu-20.04 && immutable', 'aws && aarch64', 'windows-2016 && windows-immutable', 'windows-2022 && windows-immutable', 'macos12 && x86_64'`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`stages {`
`@@ -164,7 +164,7 @@ pipeline {`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`environment {`
`167`		`- ARCH = "${PLATFORM.equals('aarch64') ? 'arm64' : 'amd64'}"`
	`167`	`+ ARCH = "${PLATFORM.contains('aarch64') ? 'arm64' : 'amd64'}"`
`168`	`168`	`DEV = true`
`169`	`169`	`EXTERNAL = true`
`170`	`170`	`}`
`@@ -175,7 +175,7 @@ pipeline {`
`175`	`175`	`withMageEnv(){`
`176`	`176`	`dir("${BASE_DIR}"){`
`177`	`177`	`withPackageEnv("${PLATFORM}") {`
`178`		`- cmd(label: 'Go package', script: 'mage package')`
	`178`	`+ cmd(label: 'Go package', script: 'mage package ironbank')`
`179`	`179`	`uploadPackagesToGoogleBucket(`
`180`	`180`	`credentialsId: env.JOB_GCS_EXT_CREDENTIALS,`
`181`	`181`	`repo: env.REPO,`
`@@ -219,7 +219,7 @@ pipeline {`
`219`	`219`	`axes {`
`220`	`220`	`axis {`
`221`	`221`	`name 'K8S_VERSION'`
`222`		`- values "v1.24.0, v1.23.6, v1.22.9, v1.21.12"`
	`222`	`+ values "v1.24.0", "v1.23.6", "v1.22.9", "v1.21.12"`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`stages {`
`@@ -251,18 +251,23 @@ pipeline {`
`251`	`251`	`}`
`252`	`252`	`steps {`
`253`	`253`	`// TODO: what's the testMatrixFile to be used if any`
`254`		`- runE2E(testMatrixFile: '',`
	`254`	`+ runE2E(testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml',`
`255`	`255`	`beatVersion: "${env.BEAT_VERSION}-SNAPSHOT",`
`256`	`256`	`elasticAgentVersion: "${env.BEAT_VERSION}-SNAPSHOT",`
`257`	`257`	`gitHubCheckName: "e2e-tests",`
`258`	`258`	`gitHubCheckRepo: env.REPO,`
`259`		`- gitHubCheckSha1: env.GIT_BASE_COMMIT)`
	`259`	`+ gitHubCheckSha1: env.GIT_BASE_COMMIT,`
	`260`	`+ propagate: true,`
	`261`	`+ wait: true)`
`260`	`262`	`}`
`261`	`263`	`}`
`262`	`264`	`}`
`263`	`265`	`post {`
`264`	`266`	`cleanup {`
`265`		`- notifyBuildResult(prComment: true)`
	`267`	`+ notifyBuildResult(prComment: true,`
	`268`	`+ analyzeFlakey: !isTag(), jobName: getFlakyJobName(withBranch: (isPR() ? env.CHANGE_TARGET : env.BRANCH_NAME)),`
	`269`	`+ githubIssue: isBranch() && currentBuild.currentResult != "SUCCESS",`
	`270`	`+ githubLabels: 'Team:Elastic-Agent-Control-Plane')`
`266`	`271`	`}`
`267`	`272`	`}`
`268`	`273`	`}`
`@@ -274,7 +279,7 @@ def isCodeCoverageEnabled() {`
`274`	`279`
`275`	`280`	`def withPackageEnv(platform, Closure body) {`
`276`	`281`	`if (isUnix()) {`
`277`		`- if (platform.contains('macosx')) {`
	`282`	`+ if (isDarwin()) {`
`278`	`283`	`withPackageDarwinEnv() {`
`279`	`284`	`body()`
`280`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`with:`
`15`	`15`	`headers: '{"GraphQL-Features": "projects_next_graphql"}'`
`16`	`16`	`query: \|`
`17`		`- mutation add_to_project($projectid:String!,$contentid:String!) {`
	`17`	`+ mutation add_to_project($projectid:[ID!]!,$contentid:ID!) {`
`18`	`18`	`updateIssue(input: {id:$contentid, projectIds:$projectid}) {`
`19`	`19`	`clientMutationId`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,3 @@ pkg/component/fake/fake`
`60`	`60`
`61`	`61`	`# VSCode`
`62`	`62`	`/.vscode`
`63`		`-`