forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into feature/windows-2016
* upstream/master: [CI] Setup git config globally (elastic#21562) docs: update generate_fields_docs.py (elastic#21359) Add support for additional fields from V2 ALB logs (elastic#21540) Move Prometheus query & remote_write to GA (elastic#21507) feat: add a new step to run the e2e tests for certain parts of Beats (elastic#21100) [Elastic Agent] Add elastic agent ID and version to events from filebeat and metricbeat. (elastic#21543) Release cloudfoundry input and processor as GA (elastic#21525) [Packetbeat] New SIP protocol (elastic#21221) [Filebeat][New Module] Add support for Microsoft MTP / 365 Defender (elastic#21446) [Beats][pytest] Asserting if filebeat logs include errors (elastic#20999) junipersrx-module initial release (elastic#20017) Add a persistent cache for cloudfoundry metadata based on badger (elastic#20775) Add missing changelog entry for cisco umbrella (elastic#21550) [Elastic Agent] Add upgrade CLI to initiate upgrade of Agent locally (elastic#21425) Enable filestream input (elastic#21533) Add filestream input reader (elastic#21481) [CI] fix 'no matches found within 10000' (elastic#21466) Fix billing.go aws.GetStartTimeEndTime (elastic#21531)
- Loading branch information
Showing
147 changed files
with
20,690 additions
and
2,414 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,7 +74,7 @@ pipeline { | |
} | ||
steps { | ||
withGithubNotify(context: 'Lint') { | ||
withBeatsEnv(archive: true) { | ||
withBeatsEnv(archive: true, id: 'lint') { | ||
dumpVariables() | ||
cmd(label: 'make check', script: 'make check') | ||
} | ||
|
@@ -265,8 +265,8 @@ def withBeatsEnv(Map args = [:], Closure body) { | |
// See https://github.com/elastic/beats/issues/17787. | ||
sh(label: 'check git config', script: ''' | ||
if [ -z "$(git config --get user.email)" ]; then | ||
git config user.email "[email protected]" | ||
git config user.name "beatsmachine" | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "beatsmachine" | ||
fi''') | ||
} | ||
try { | ||
|
@@ -345,8 +345,13 @@ def archiveTestOutput(Map args = [:]) { | |
} | ||
cmd(label: 'Prepare test output', script: 'python .ci/scripts/pre_archive_test.py') | ||
dir('build') { | ||
if (isUnix()) { | ||
cmd(label: 'Delete folders that are causing exceptions (See JENKINS-58421)', | ||
returnStatus: true, | ||
script: 'rm -rf ve || true; find . -type d -name vendor -exec rm -r {} \\;') | ||
} else { log(level: 'INFO', text: 'Delete folders that are causing exceptions (See JENKINS-58421) is disabled for Windows.') } | ||
junitAndStore(allowEmptyResults: true, keepLongStdio: true, testResults: args.testResults, stashedTestReports: stashedTestReports, id: args.id) | ||
archiveArtifacts(allowEmptyArchive: true, artifacts: args.artifacts) | ||
tar(file: "test-build-artifacts-${args.id}.tgz", dir: '.', archive: true, allowMissing: true) | ||
} | ||
catchError(buildResult: 'SUCCESS', message: 'Failed to archive the build test results', stageResult: 'SUCCESS') { | ||
def folder = cmd(label: 'Find system-tests', returnStdout: true, script: 'python .ci/scripts/search_system_tests.py').trim() | ||
|
Oops, something went wrong.