ci: enable orka (elastic#29426)

efd6 · Dec 16, 2021 · 8921ea4 · 8921ea4
1 parent 43ae3c9
commit 8921ea4
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -634,7 +634,7 @@ def withBeatsEnv(Map args = [:], Closure body) {
 
   if(isUnix()) {
     gox_flags = (isArm() && is64arm()) ? '-arch arm' : '-arch amd64'
-    path = "${env.WORKSPACE}/bin:${env.PATH}"
+    path = "${env.WORKSPACE}/bin:${env.PATH}:/usr/local/bin"
     magefile = "${WORKSPACE}/.magefile"
     pythonEnv = "${WORKSPACE}/python-env"
     testResults = '**/build/TEST*.xml'

diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml
@@ -44,7 +44,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test auditbeat for macos"

diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml
@@ -55,7 +55,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test filebeat for macos"

diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml
@@ -49,7 +49,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test heartbeat for macos"

diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml
@@ -38,7 +38,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test metricbeat for macos"

diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml
@@ -42,7 +42,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test packetbeat for macos"

diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml
@@ -42,7 +42,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/auditbeat for macos"

diff --git a/x-pack/auditbeat/tests/system/test_metricsets.py b/x-pack/auditbeat/tests/system/test_metricsets.py
@@ -48,6 +48,7 @@ def test_metricset_login(self):
     @unittest.skipIf(sys.platform == "win32", "Not implemented for Windows")
     @unittest.skipIf(sys.platform.startswith('linux') and not (os.path.isdir("/var/lib/dpkg") or os.path.isdir("/var/lib/rpm")),
                      "Only implemented for dpkg and rpm")
+    @unittest.skipIf(sys.platform.startswith('darwin'), "See https://github.com/elastic/beats/issues/21308")
     def test_metricset_package(self):
         """
         package metricset collects information about installed packages on a system.

diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml
@@ -42,7 +42,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-            - "macosx&&x86_64"
+            - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/elastic-agent for macos"

diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml
@@ -55,7 +55,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/filebeat for macos"

diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml
@@ -39,7 +39,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/functionbeat for macos"

diff --git a/x-pack/heartbeat/Jenkinsfile.yml b/x-pack/heartbeat/Jenkinsfile.yml
@@ -30,7 +30,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/heartbeat for macos"

diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml
@@ -60,7 +60,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/metricbeat for macos"

diff --git a/x-pack/osquerybeat/Jenkinsfile.yml b/x-pack/osquerybeat/Jenkinsfile.yml
@@ -28,7 +28,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/osquerybeat for macos"

diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml
@@ -42,7 +42,7 @@ stages:
     macos:
         mage: "mage build unitTest"
         platforms:             ## override default label in this specific stage.
-          - "macosx&&x86_64"
+          - "orka && darwin && poc"
         when:                  ## Override the top-level when.
             comments:
                 - "/test x-pack/packetbeat for macos"