Skip to content

Commit 043f9cb

Browse files
donoghucdonoghuc
committed
fix merge conflict
1 parent da10a12 commit 043f9cb

File tree

4 files changed

+12
-53
lines changed

4 files changed

+12
-53
lines changed

‎.buildkite/scripts/build-pipeline/generate-steps.py‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,45 +62,29 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
6262

6363
steps = []
6464
response = call_url_with_retry(RELEASES_URL)
65-
<<<<<<< HEAD
66-
versions_json = response.json()
65+
yaml = YAML(typ='safe')
66+
versions_yaml: typing.final = yaml.load(response.text)
6767

6868
# there are situations to manually run CIs with PR change,
6969
# set MANUAL_TARGET_BRANCH with upstream target branch and run
7070
manually_set_target_branch: typing.final = os.getenv("MANUAL_TARGET_BRANCH")
7171
target_branch: typing.final = manually_set_target_branch if manually_set_target_branch else os.getenv("TARGET_BRANCH")
7272
print(f"Running with target_branch: {target_branch}")
7373
if target_branch == '8.x':
74-
full_stack_version: typing.final = versions_json["snapshots"]["8.future"]
74+
full_stack_version: typing.final = versions_yaml["snapshots"]["8.future"]
7575
steps += generate_unit_and_integration_test_steps(full_stack_version, "true")
7676
elif target_branch == 'main':
77-
full_stack_version: typing.final = versions_json["snapshots"][target_branch]
77+
full_stack_version: typing.final = versions_yaml["snapshots"][target_branch]
7878
steps += generate_unit_and_integration_test_steps(full_stack_version, "true")
7979
else:
8080
# generate steps for the version if released
81-
releases = versions_json["releases"]
81+
releases = versions_yaml["releases"]
8282
for release_version in releases:
8383
if releases[release_version].startswith(target_branch):
8484
steps += generate_unit_and_integration_test_steps(releases[release_version], "false")
8585
break
86-
=======
87-
yaml = YAML(typ='safe')
88-
versions_yaml: typing.final = yaml.load(response.text)
89-
90-
# Use BUILDKITE_SOURCE to figure out PR merge or schedule.
91-
# If PR merge, no need to run builds on all branches, target branch will be good
92-
# - webhook when PR gets merged
93-
# - schedule when daily schedule starts
94-
# - ui when manually kicking job from BK UI
95-
# - manual kick off will be on PR or entire main branch, can be decided with BUILDKITE_BRANCH
96-
bk_source = os.getenv("BUILDKITE_SOURCE")
97-
bk_branch = os.getenv("BUILDKITE_BRANCH")
98-
steps = generate_steps_for_scheduler(versions_yaml) if (bk_source == "schedule" or bk_branch == "main") \
99-
else generate_steps_for_main_branch(versions_yaml)
100-
>>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))
101-
10286
# steps for snapshot version
103-
snapshots = versions_json["snapshots"]
87+
snapshots = versions_yaml["snapshots"]
10488
for snapshot_version in snapshots:
10589
if snapshots[snapshot_version].startswith(target_branch):
10690
steps += generate_unit_and_integration_test_steps(snapshots[snapshot_version], "false")

‎.buildkite/scripts/e2e-pipeline/generate-steps.py‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,45 +45,29 @@ def generate_test_step(stack_version, es_treeish, snapshot) -> dict:
4545

4646
steps = []
4747
response = call_url_with_retry(RELEASES_URL)
48-
<<<<<<< HEAD
49-
versions_json = response.json()
48+
yaml = YAML(typ='safe')
49+
versions_yaml: typing.final = yaml.load(response.text)
5050

5151
# there are situations to manually run CIs with PR change,
5252
# set MANUAL_TARGET_BRANCH with upstream target branch and run
5353
manually_set_target_branch: typing.final = os.getenv("MANUAL_TARGET_BRANCH")
5454
target_branch: typing.final = manually_set_target_branch if manually_set_target_branch else os.getenv("TARGET_BRANCH")
5555
print(f"Running with target_branch: {target_branch}")
5656
if target_branch == '8.x':
57-
full_stack_version: typing.final = versions_json["snapshots"]["8.future"]
57+
full_stack_version: typing.final = versions_yaml["snapshots"]["8.future"]
5858
steps.append(generate_test_step(full_stack_version, target_branch, "true"))
5959
elif target_branch == 'main':
60-
full_stack_version: typing.final = versions_json["snapshots"][target_branch]
60+
full_stack_version: typing.final = versions_yaml["snapshots"][target_branch]
6161
steps.append(generate_test_step(full_stack_version, target_branch, "true"))
6262
else:
6363
# generate steps for the version if released
64-
releases = versions_json["releases"]
64+
releases = versions_yaml["releases"]
6565
for release_version in releases:
6666
if releases[release_version].startswith(target_branch):
6767
steps.append(generate_test_step(releases[release_version], target_branch, "false"))
6868
break
69-
=======
70-
yaml = YAML(typ='safe')
71-
versions_yaml: typing.final = yaml.load(response.text)
72-
73-
# Use BUILDKITE_SOURCE to figure out PR merge or schedule.
74-
# If PR merge, no need to run builds on all branches, target branch will be good
75-
# - webhook when PR gets merged
76-
# - schedule when daily schedule starts
77-
# - ui when manually kicking job from BK UI
78-
# - manual kick off will be on PR or entire main branch, can be decided with BUILDKITE_BRANCH
79-
bk_source = os.getenv("BUILDKITE_SOURCE")
80-
bk_branch = os.getenv("BUILDKITE_BRANCH")
81-
steps = generate_steps_for_scheduler(versions_yaml) if (bk_source == "schedule" or bk_branch == "main") \
82-
else generate_steps_for_main_branch(versions_yaml)
83-
>>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))
84-
8569
# steps for snapshot version
86-
snapshots = versions_json["snapshots"]
70+
snapshots = versions_yaml["snapshots"]
8771
for snapshot_version in snapshots:
8872
if snapshots[snapshot_version].startswith(target_branch):
8973
steps.append(generate_test_step(snapshots[snapshot_version], target_branch, "false"))

‎.buildkite/scripts/pull-request-pipeline/generate-steps.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@
66

77
from ruamel.yaml import YAML
88

9-
<<<<<<< HEAD
10-
RELEASES_URL = "https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json"
11-
TEST_MATRIX_URL = "https://raw.githubusercontent.com/elastic/logstash-filter-elastic_integration/main/.buildkite/pull-request-test-matrix.yml"
12-
=======
139
RELEASES_URL = "https://raw.githubusercontent.com/logstash-plugins/.ci/refs/heads/1.x/logstash-versions.yml"
1410
TEST_MATRIX_URL = "https://raw.githubusercontent.com/elastic/logstash-filter-elastic_integration/main/.buildkite/pull" \
1511
"-request-test-matrix.yml"
16-
>>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))
1712
TEST_COMMAND: typing.final = ".buildkite/scripts/run_tests.sh"
1813

1914

‎.buildkite/scripts/run_tests.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<<<<<<< HEAD
2-
mkdir -p .ci && curl -sL --retry 5 --retry-delay 5 https://github.com/logstash-plugins/.ci/archive/1.x.tar.gz | tar zxvf - --skip-old-files --strip-components=1 -C .ci --wildcards '*Dockerfile*' '*docker*' '*.sh' && .ci/docker-setup.sh && .ci/docker-run.sh
3-
=======
41
#!/usr/bin/env bash
52

63
export JAVA_HOME="/opt/buildkite-agent/.java/adoptiumjdk_21"
@@ -15,4 +12,3 @@ else
1512
fi
1613

1714
mkdir -p .ci && curl -sL --retry 5 --retry-delay 5 https://github.com/logstash-plugins/.ci/archive/1.x.tar.gz | tar zxvf - --skip-old-files --strip-components=1 -C .ci --wildcards '*Dockerfile*' '*docker*' '*.sh' '*logstash-versions*' && .ci/docker-setup.sh && .ci/docker-run.sh
18-
>>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))

0 commit comments

Comments
 (0)