Skip to content

Commit

Permalink
[CI]: use the downstream packaging pipeline for branches/tags (#28589)
Browse files Browse the repository at this point in the history
(cherry picked from commit ccc880e)
  • Loading branch information
v1v authored and mergify-bot committed Oct 26, 2021
1 parent 9605470 commit 0b44196
Show file tree
Hide file tree
Showing 17 changed files with 180 additions and 3 deletions.
12 changes: 12 additions & 0 deletions auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^auditbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^auditbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^filebeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^filebeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^heartbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^heartbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions journalbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^journalbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^journalbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,22 @@ stages:
e2e:
enabled: false ## e2e is enabled only for x-pack beats
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^metricbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^metricbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^packetbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^packetbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
6 changes: 6 additions & 0 deletions winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,9 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^winlogbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
12 changes: 12 additions & 0 deletions x-pack/auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/auditbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/auditbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
12 changes: 12 additions & 0 deletions x-pack/dockerlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/dockerlogbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/dockerlogbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
15 changes: 12 additions & 3 deletions x-pack/elastic-agent/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,23 @@ stages:
e2e:
enabled: true
testMatrixFile: '.ci/.e2e-tests-for-elastic-agent.yaml'
when: ## Customise when to run this subtask in the packaging stage.
branches: false ## Only on a PR basis for the time being
tags: false ## e2e on branches/tags is already in place with the downstream build.
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/elastic-agent/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/elastic-agent/.*"
- "@xpack" ## special token regarding the changeset for the xpack
12 changes: 12 additions & 0 deletions x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/filebeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/filebeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
6 changes: 6 additions & 0 deletions x-pack/functionbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,9 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/functionbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
12 changes: 12 additions & 0 deletions x-pack/heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/heartbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/heartbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
12 changes: 12 additions & 0 deletions x-pack/metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,22 @@ stages:
enabled: false
entrypoint: 'metricbeat-test.sh'
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/metricbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/metricbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
6 changes: 6 additions & 0 deletions x-pack/osquerybeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,9 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/osquerybeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
12 changes: 12 additions & 0 deletions x-pack/packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,22 @@ stages:
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/packetbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
packaging-arm:
packaging-arm: "mage package"
e2e:
enabled: false
platforms: ## override default label in this specific stage.
- "arm"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/packetbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack
6 changes: 6 additions & 0 deletions x-pack/winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,9 @@ stages:
platforms: ## override default labels in this specific stage.
- "immutable && ubuntu-18"
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^x-pack/winlogbeat/.*"
- "@xpack" ## special token regarding the changeset for the xpack

0 comments on commit 0b44196

Please sign in to comment.