Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] fix No such property: APM_URL_BASE #185

Merged
merged 6 commits into from
Oct 22, 2020
Merged

[CI] fix No such property: APM_URL_BASE #185

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a110774
[CI] fix No such property: APM_URL_BASE
v1v Oct 22, 2020
f2bfbef
Add debug
v1v Oct 22, 2020
66361d8
fix null string
v1v Oct 22, 2020
28238d8
Let's use the and
v1v Oct 22, 2020
4fa1509
Skip tags if no params are passed
v1v Oct 22, 2020
d4c3268
Update .ci/Jenkinsfile
v1v Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,28 @@ pipeline {
unstash 'source'
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
script: """#!/bin/bash -x
v1v marked this conversation as resolved.
Show resolved Hide resolved
## 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')
}
}
Expand Down
17 changes: 17 additions & 0 deletions packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- darwin
become: yes
tags:
- beats
- packetbeat
vars:
- beat_name: packetbeat
Expand All @@ -45,6 +46,7 @@
- darwin
become: yes
tags:
- beats
- filebeat
vars:
- beat_name: filebeat
Expand All @@ -64,6 +66,7 @@
- darwin
become: yes
tags:
- beats
- metricbeat
vars:
- beat_name: metricbeat
Expand All @@ -83,6 +86,7 @@
- darwin
become: yes
tags:
- beats
- heartbeat
vars:
- beat_name: heartbeat
Expand All @@ -103,6 +107,7 @@
- darwin
become: yes
tags:
- beats
- auditbeat
vars:
- beat_name: auditbeat
Expand Down Expand Up @@ -142,6 +147,7 @@
hosts:
- windows
tags:
- beats
- packetbeat
- windows
vars:
Expand Down Expand Up @@ -174,6 +180,7 @@
hosts:
- windows
tags:
- beats
- packetbeat
- windows
vars:
Expand All @@ -190,6 +197,7 @@
hosts:
- windows
tags:
- beats
- metricbeat
- windows
vars:
Expand All @@ -206,6 +214,7 @@
hosts:
- windows
tags:
- beats
- metricbeat
- windows
vars:
Expand All @@ -222,6 +231,7 @@
hosts:
- windows
tags:
- beats
- filebeat
- windows
vars:
Expand All @@ -238,6 +248,7 @@
hosts:
- windows
tags:
- beats
- filebeat
- windows
vars:
Expand All @@ -254,6 +265,7 @@
hosts:
- windows
tags:
- beats
- heartbeat
- windows
vars:
Expand All @@ -270,6 +282,7 @@
hosts:
- windows
tags:
- beats
- heartbeat
- windows
vars:
Expand All @@ -286,6 +299,7 @@
hosts:
- windows
tags:
- beats
- winlogbeat
- windows
vars:
Expand All @@ -302,6 +316,7 @@
hosts:
- windows
tags:
- beats
- winlogbeat
- windows
vars:
Expand All @@ -319,6 +334,7 @@
- windows
tags:
- auditbeat
- beats
- windows
vars:
- beat_name: auditbeat
Expand All @@ -339,6 +355,7 @@
- windows
tags:
- auditbeat
- beats
- windows
vars:
- beat_name: auditbeat
Expand Down