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/2.0-skip-…
…ci-build-label-support * upstream/master: (60 commits) Skip publisher flaky tests (elastic#21657) backport: add 7.10 branch (elastic#21635) [CI: Packaging] fix: push ubi8 images too (elastic#21621) Docker build resiliance with a retry (elastic#21587) Fix flaky FSWatch/FSScanner tests (elastic#21625) chore: add versions 7.1x (elastic#21670) [Elastic Agent] Reload fleet.kibana.hosts from policy change (elastic#21599) Fix cyberark/corepas pipeline (elastic#21643) Add openstack ssl provider in add_cloud_metadata (elastic#21590) Add fips_enabled into all aws filesets (elastic#21626) [Filebeat S3] Change log.file.path to be nested object (elastic#21624) [CI] Change notification channel (elastic#21559) Add `add_observer_metadata` `geo.name` to Quickstart (elastic#21501) [E2E Tests] fix: set versions ony for PRs (elastic#21608) Fix badger build in 386 (elastic#21613) docs: Update timestamp.asciidoc (elastic#20395) Remove nil-zero metrics and linux-exclusive metrics from Metricbeat (elastic#21457) [Metricbeat] Use timestamp from CloudWatch for events (elastic#21498) [Filebeat][S3 Input] Add support for FIPS endpoints (elastic#21585) [Ingest Manager] Use new form of fleet API paths (elastic#21478) ...
- Loading branch information
Showing
455 changed files
with
28,768 additions
and
4,770 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
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
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
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 |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ pipeline { | |
| PIPELINE_LOG_LEVEL = 'INFO' | ||
| PYTEST_ADDOPTS = "${params.PYTEST_ADDOPTS}" | ||
| RUNBLD_DISABLE_NOTIFICATIONS = 'true' | ||
| SLACK_CHANNEL = "#beats-ci-builds" | ||
| SLACK_CHANNEL = "#beats-build" | ||
| TERRAFORM_VERSION = "0.12.24" | ||
| XPACK_MODULE_PATTERN = '^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*' | ||
| } | ||
|
|
@@ -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') | ||
| } | ||
|
|
@@ -127,7 +127,7 @@ pipeline { | |
| runbld(stashedTestReports: stashedTestReports, project: env.REPO) | ||
| } | ||
| cleanup { | ||
| notifyBuildResult(prComment: true, slackComment: true) | ||
| notifyBuildResult(prComment: true, slackComment: true, slackNotify: (isBranch() || isTag())) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -270,8 +270,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 { | ||
|
|
@@ -350,8 +350,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.