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-7-64
* upstream/master: (216 commits) [CI] Enable build stage for arm architecture (elastic#21284) [BUILD][CI] fetch dependencies with retry (elastic#21614) Add proxy metricset (elastic#21751) [Filebeat][httpjson] Fix date_cursor validation (elastic#21756) Update endpoint-related terminology in Elastic Agent docs (elastic#21458) Move s3_daily_storage and s3_request metricsets to use cloudwatch input (elastic#21703) [Agent] Remove heartbeat from bundled beats in agent. (elastic#21602) [Elastic Agent] Don't perform install until after enroll (elastic#21772) [Elastic Agent] Update path from policy change for Kibana connection. (elastic#21804) Change cloud.provider from googlecloud to gcp (elastic#21775) Fix stress test package list (elastic#21719) [Elastic Agent] Remove the service installer scripts from packaging (elastic#21694) [CI] Support Windows-2012 in pipeline 2.0 (elastic#21338) Fix non-windows fields on system/filesystem (elastic#21758) disable TestReceiveEventsAndMetadata/TestSocketCleanup/TestReceiveNewEventsConcurrently in Windows (elastic#21750) Use badger code from upstream repository (elastic#21705) Disable writes sync in persistent cache (elastic#21754) Make API address and Shard ID required in Cloud Foundry settings (elastic#21759) [CI] Support skip-ci label (elastic#21377) Increase recommended memory when deploying in Cloud foundry (elastic#21755) ...
- Loading branch information
Showing
1,249 changed files
with
440,138 additions
and
34,732 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| #!/usr/bin/env groovy | ||
|
|
||
| @Library('apm@current') _ | ||
|
|
||
| pipeline { | ||
| agent none | ||
| environment { | ||
| BASE_DIR = 'src/github.com/elastic/beats' | ||
| PIPELINE_LOG_LEVEL = "INFO" | ||
| BEATS_TESTER_JOB = 'Beats/beats-tester-mbp/master' | ||
| } | ||
| options { | ||
| timeout(time: 1, unit: 'HOURS') | ||
| buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30')) | ||
| timestamps() | ||
| ansiColor('xterm') | ||
| disableResume() | ||
| durabilityHint('PERFORMANCE_OPTIMIZED') | ||
| disableConcurrentBuilds() | ||
| } | ||
| triggers { | ||
| issueCommentTrigger('(?i)^\\/beats-tester$') | ||
| upstream("Beats/packaging/${env.JOB_BASE_NAME}") | ||
| } | ||
| stages { | ||
| stage('Filter build') { | ||
| agent { label 'ubuntu && immutable' } | ||
| when { | ||
| beforeAgent true | ||
| anyOf { | ||
| triggeredBy cause: "IssueCommentCause" | ||
| expression { | ||
| def ret = isUserTrigger() || isUpstreamTrigger() | ||
| if(!ret){ | ||
| currentBuild.result = 'NOT_BUILT' | ||
| currentBuild.description = "The build has been skipped" | ||
| currentBuild.displayName = "#${BUILD_NUMBER}-(Skipped)" | ||
| echo("the build has been skipped due the trigger is a branch scan and the allow ones are manual, GitHub comment, and upstream job") | ||
| } | ||
| return ret | ||
| } | ||
| } | ||
| } | ||
| stages { | ||
| stage('Checkout') { | ||
| options { skipDefaultCheckout() } | ||
| steps { | ||
| deleteDir() | ||
| gitCheckout(basedir: "${BASE_DIR}") | ||
| setEnvVar('VERSION', sh(script: "grep ':stack-version:' ${BASE_DIR}/libbeat/docs/version.asciidoc | cut -d' ' -f2", returnStdout: true).trim()) | ||
| } | ||
| } | ||
| stage('Build master') { | ||
| options { skipDefaultCheckout() } | ||
| when { branch 'master' } | ||
| steps { | ||
| runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT") | ||
| } | ||
| } | ||
| stage('Build *.x branch') { | ||
| options { skipDefaultCheckout() } | ||
| when { branch '*.x' } | ||
| steps { | ||
| runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT") | ||
| } | ||
| } | ||
| stage('Build PullRequest') { | ||
| options { skipDefaultCheckout() } | ||
| when { changeRequest() } | ||
| steps { | ||
| runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT", | ||
| apm: "https://storage.googleapis.com/apm-ci-artifacts/jobs/pull-requests/pr-${env.CHANGE_ID}", | ||
| beats: "https://storage.googleapis.com/beats-ci-artifacts/pull-requests/pr-${env.CHANGE_ID}") | ||
| } | ||
| } | ||
| stage('Build release branch') { | ||
| options { skipDefaultCheckout() } | ||
| when { | ||
| not { | ||
| allOf { | ||
| branch comparator: 'REGEXP', pattern: '(master|.*x)' | ||
| changeRequest() | ||
| } | ||
| } | ||
| } | ||
| steps { | ||
| runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def runBeatsTesterJob(Map args = [:]) { | ||
| if (args.apm && args.beats) { | ||
| build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, | ||
| parameters: [ | ||
| string(name: 'APM_URL_BASE', value: args.apm), | ||
| string(name: 'BEATS_URL_BASE', value: args.beats), | ||
| string(name: 'VERSION', value: args.version) | ||
| ]) | ||
| } else { | ||
| build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, parameters: [ string(name: 'VERSION', value: args.version) ]) | ||
| } | ||
| } |
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 was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| - job: | ||
| name: Beats/Release/beats-release-changelog | ||
| display-name: 'Prepare the Changelog for a Release' | ||
| description: 'Automate the steps to prepare the Changelog for a Release' | ||
| view: Beats | ||
| project-type: pipeline | ||
| pipeline-scm: | ||
| script-path: release_scripts/pipeline-release-changelog.groovy | ||
| scm: | ||
| - git: | ||
| url: git@github.com:elastic/ingest-dev.git | ||
| refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/* | ||
| wipe-workspace: 'True' | ||
| name: origin | ||
| shallow-clone: true | ||
| credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| reference-repo: /var/lib/jenkins/.git-references/ingest-dev.git | ||
| branches: | ||
| - master |
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| - job: | ||
| name: Beats/Release/beats-release-minor-major | ||
| display-name: 'Prepare Major/minor Release' | ||
| description: 'Automate the steps to prepare a new Release branch' | ||
| view: Beats | ||
| project-type: pipeline | ||
| pipeline-scm: | ||
| script-path: release_scripts/pipeline-release-minor-major.groovy | ||
| scm: | ||
| - git: | ||
| url: git@github.com:elastic/ingest-dev.git | ||
| refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/* | ||
| wipe-workspace: 'True' | ||
| name: origin | ||
| shallow-clone: true | ||
| credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| reference-repo: /var/lib/jenkins/.git-references/ingest-dev.git | ||
| branches: | ||
| - master |
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| - job: | ||
| name: Beats/Release/beats-release-patch | ||
| display-name: 'Prepare Patch Release' | ||
| description: 'Automate the steps to prepare a new Patch' | ||
| view: Beats | ||
| project-type: pipeline | ||
| pipeline-scm: | ||
| script-path: release_scripts/pipeline-release-patch.groovy | ||
| scm: | ||
| - git: | ||
| url: git@github.com:elastic/ingest-dev.git | ||
| refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/* | ||
| wipe-workspace: 'True' | ||
| name: origin | ||
| shallow-clone: true | ||
| credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| reference-repo: /var/lib/jenkins/.git-references/ingest-dev.git | ||
| branches: | ||
| - master |
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 |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| --- | ||
| - job: | ||
| name: Beats/beats-tester | ||
| display-name: Beats Tester | ||
| description: Run the beats-tester | ||
| view: Beats | ||
| disabled: false | ||
| project-type: multibranch | ||
| script-path: .ci/beats-tester.groovy | ||
| scm: | ||
| - github: | ||
| branch-discovery: 'no-pr' | ||
| discover-pr-forks-strategy: 'merge-current' | ||
| discover-pr-forks-trust: 'permission' | ||
| discover-pr-origin: 'merge-current' | ||
| discover-tags: true | ||
| head-filter-regex: '(master|7\.([x9]|1\d+)|8\.\d+|PR-.*|v\d+\.\d+\.\d+)' | ||
| disable-pr-notifications: true | ||
| notification-context: 'beats-tester' | ||
| repo: 'beats' | ||
| repo-owner: 'elastic' | ||
| credentials-id: github-app-beats-ci | ||
| ssh-checkout: | ||
| credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| build-strategies: | ||
| - skip-initial-build: true | ||
| - tags: | ||
| ignore-tags-older-than: -1 | ||
| ignore-tags-newer-than: 30 | ||
| - named-branches: | ||
| - exact-name: | ||
| name: 'master' | ||
| case-sensitive: true | ||
| - regex-name: | ||
| regex: '7\.([x9]|1\d+)' | ||
| case-sensitive: true | ||
| - regex-name: | ||
| regex: '8\.\d+' | ||
| case-sensitive: true | ||
| - change-request: | ||
| ignore-target-only-changes: true | ||
| clean: | ||
| after: true | ||
| before: true | ||
| prune: true | ||
| shallow-clone: true | ||
| depth: 10 | ||
| do-not-fetch-tags: true | ||
| submodule: | ||
| disable: false | ||
| recursive: true | ||
| parent-credentials: true | ||
| timeout: 100 | ||
| timeout: '15' | ||
| use-author: true | ||
| wipe-workspace: true |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.