[CI] fix No such property: APM_URL_BASE (#185)

elastic · Oct 22, 2020 · 6289c9a · 6289c9a
1 parent 03c46df
commit 6289c9a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -64,17 +64,27 @@ pipeline {
               dir("${BASE_DIR}"){
                 sh(label: 'make batch',
                   script: """#!/bin/bash
-                    echo "beats_url_base: ${BEATS_URL_BASE}" > run-settings-jenkins.yml
-                    echo "apm_url_base: ${APM_URL_BASE}" >> run-settings-jenkins.yml
+                    ## Skip BEATS if no params.
+                    if [[ "${env.BEATS_URL_BASE}" != "null" && -n "${env.BEATS_URL_BASE?.trim()}" ]] ; then
+                      echo "beats_url_base: ${env.BEATS_URL_BASE}" > run-settings-jenkins.yml
+                    else
+                      ANSIBLE_EXTRA_FLAGS="--skip-tags beats"
+                    fi
+                    ## Skip APM if no params.
+                    if [[ "${env.APM_URL_BASE}" != "null" && -n "${env.APM_URL_BASE?.trim()}" ]] ; then
+                      echo "apm_url_base: ${env.APM_URL_BASE}" >> run-settings-jenkins.yml
+                    else
+                      ANSIBLE_EXTRA_FLAGS="--skip-tags apm-server"
+                    fi
                     echo "version: ${VERSION}" >> run-settings-jenkins.yml
-                    RUN_SETTINGS=jenkins make batch""")
+                    ANSIBLE_EXTRA_FLAGS=\${ANSIBLE_EXTRA_FLAGS} RUN_SETTINGS=jenkins make batch""")
               }
             }
             post {
               always {
                 dir("${BASE_DIR}"){
                   junit(allowEmptyResults: true, keepLongStdio: true, testResults: "logs/*.xml")
-                  archiveArtifacts(allowEmptyArchive: true, artifacts: 'logs/**')
+                  archiveArtifacts(allowEmptyArchive: true, artifacts: 'logs/**,run-settings-jenkins.yml')
                   sh(label: 'make clean', script: 'make clean')
                 }
               }

diff --git a/packages.yml b/packages.yml
@@ -26,6 +26,7 @@
     - darwin
   become: yes
   tags:
+    - beats
     - packetbeat
   vars:
     - beat_name: packetbeat
@@ -45,6 +46,7 @@
     - darwin
   become: yes
   tags:
+    - beats
     - filebeat
   vars:
     - beat_name: filebeat
@@ -64,6 +66,7 @@
     - darwin
   become: yes
   tags:
+    - beats
     - metricbeat
   vars:
     - beat_name: metricbeat
@@ -83,6 +86,7 @@
     - darwin
   become: yes
   tags:
+    - beats
     - heartbeat
   vars:
     - beat_name: heartbeat
@@ -103,6 +107,7 @@
     - darwin
   become: yes
   tags:
+    - beats
     - auditbeat
   vars:
     - beat_name: auditbeat
@@ -142,6 +147,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - packetbeat
     - windows
   vars:
@@ -174,6 +180,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - packetbeat
     - windows
   vars:
@@ -190,6 +197,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - metricbeat
     - windows
   vars:
@@ -206,6 +214,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - metricbeat
     - windows
   vars:
@@ -222,6 +231,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - filebeat
     - windows
   vars:
@@ -238,6 +248,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - filebeat
     - windows
   vars:
@@ -254,6 +265,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - heartbeat
     - windows
   vars:
@@ -270,6 +282,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - heartbeat
     - windows
   vars:
@@ -286,6 +299,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - winlogbeat
     - windows
   vars:
@@ -302,6 +316,7 @@
   hosts:
     - windows
   tags:
+    - beats
     - winlogbeat
     - windows
   vars:
@@ -319,6 +334,7 @@
     - windows
   tags:
     - auditbeat
+    - beats
     - windows
   vars:
     - beat_name: auditbeat
@@ -339,6 +355,7 @@
     - windows
   tags:
     - auditbeat
+    - beats
     - windows
   vars:
     - beat_name: auditbeat