Skip to content

Commit 7c8cd0a

Browse files
authored
Separate branch steps based on a target branch. (#186)
* Separate pull request CI jobs based on target branch. * Keep only main branch CI jobs in a single yaml.
1 parent e5290fd commit 7c8cd0a

File tree

2 files changed

+5
-49
lines changed

2 files changed

+5
-49
lines changed

.buildkite/e2e-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ steps:
2626
env:
2727
ELASTIC_STACK_VERSION: "8.current"
2828
SNAPSHOT: true
29+
TARGET_BRANCH: "8.x"
2930

3031
- label: ":test_tube: Run E2E tests with LS `main` :rocket:"
3132
# uses the LS & plugin main branch when building the plugin

.buildkite/pull-request-pipeline.yml

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,18 @@ agents:
66

77
steps:
88
# ------------- Unit tests ---------------------
9-
- label: ":hammer: Unit tests with LS & ES 8.x-SNAPSHOT :docker:"
10-
# Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES version defined in gradle.properties
11-
# Runs unit tests on LS & ES 8.x-SNAPSHOT docker
12-
command:
13-
- .buildkite/scripts/run_tests.sh
14-
env:
15-
ELASTIC_STACK_VERSION: "8.current"
16-
SNAPSHOT: true
17-
INTEGRATION: false
18-
19-
- label: ":hammer: Unit tests with LS 8.x-SNAPSHOT & ES main :docker:"
20-
# Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES main
21-
# Runs unit tests on LS & ES 8.x-SNAPSHOT docker
9+
- label: ":hammer: Unit tests with LS & ES main :docker:"
10+
# Builds the plugin (with current changes) against LS and ES main
11+
# Runs unit tests on LS & ES main docker
2212
command:
2313
- .buildkite/scripts/run_tests.sh
2414
env:
25-
ELASTIC_STACK_VERSION: "8.current"
15+
ELASTIC_STACK_VERSION: main
2616
ELASTICSEARCH_TREEISH: main
2717
INTEGRATION: false
2818
SNAPSHOT: true
2919

3020
# ------------- Integration tests ---------------------
31-
- label: ":hammer: Integration tests with LS & ES 8.x :docker:"
32-
# Builds the plugin (with current changes) against LS 8.x and ES version defined in gradle.properties
33-
# Runs integration tests on LS & ES 8.x docker
34-
command:
35-
- .buildkite/scripts/run_tests.sh
36-
env:
37-
ELASTIC_STACK_VERSION: "8.current"
38-
INTEGRATION: true
39-
SECURE_INTEGRATION: true
40-
41-
- label: ":hammer: Integration tests with LS & ES 8.x-SNAPSHOT :docker:"
42-
# Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES version defined in gradle.properties
43-
# Runs integration tests on LS & ES 8.x-SNAPSHOT docker
44-
command:
45-
- .buildkite/scripts/run_tests.sh
46-
env:
47-
ELASTIC_STACK_VERSION: "8.current"
48-
SNAPSHOT: true
49-
INTEGRATION: true
50-
SECURE_INTEGRATION: true
51-
LOG_LEVEL: "info"
52-
53-
- label: ":hammer: Integration tests with LS 8.x-SNAPSHOT & ES main :docker:"
54-
# Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES main
55-
# Runs integration tests on LS & ES 8.x-SNAPSHOT docker
56-
command:
57-
- .buildkite/scripts/run_tests.sh
58-
env:
59-
ELASTIC_STACK_VERSION: "8.current"
60-
ELASTICSEARCH_TREEISH: "main"
61-
SNAPSHOT: true
62-
INTEGRATION: true
63-
SECURE_INTEGRATION: true
64-
LOG_LEVEL: "info"
65-
6621
- label: ":hammer: Integration tests with LS & ES main :docker:"
6722
# Builds the plugin (with current changes) against LS and ES main
6823
# Runs integration tests on snapshot.main of https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json

0 commit comments

Comments
 (0)