fix merge conflict

Author: donoghuc

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

@@ -62,45 +62,29 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
 
     steps = []
     response = call_url_with_retry(RELEASES_URL)
-<<<<<<< HEAD
-    versions_json = response.json()
+    yaml = YAML(typ='safe')
+    versions_yaml: typing.final = yaml.load(response.text)
 
     # there are situations to manually run CIs with PR change,
     # set MANUAL_TARGET_BRANCH with upstream target branch and run
     manually_set_target_branch: typing.final = os.getenv("MANUAL_TARGET_BRANCH")
     target_branch: typing.final = manually_set_target_branch if manually_set_target_branch else os.getenv("TARGET_BRANCH")
     print(f"Running with target_branch: {target_branch}")
     if target_branch == '8.x':
-        full_stack_version: typing.final = versions_json["snapshots"]["8.future"]
+        full_stack_version: typing.final = versions_yaml["snapshots"]["8.future"]
         steps += generate_unit_and_integration_test_steps(full_stack_version, "true")
     elif target_branch == 'main':
-        full_stack_version: typing.final = versions_json["snapshots"][target_branch]
+        full_stack_version: typing.final = versions_yaml["snapshots"][target_branch]
         steps += generate_unit_and_integration_test_steps(full_stack_version, "true")
     else:
         # generate steps for the version if released
-        releases = versions_json["releases"]
+        releases = versions_yaml["releases"]
         for release_version in releases:
             if releases[release_version].startswith(target_branch):
                 steps += generate_unit_and_integration_test_steps(releases[release_version], "false")
                 break
-=======
-    yaml = YAML(typ='safe')
-    versions_yaml: typing.final = yaml.load(response.text)
-
-    # Use BUILDKITE_SOURCE to figure out PR merge or schedule.
-    # If PR merge, no need to run builds on all branches, target branch will be good
-    #   - webhook when PR gets merged
-    #   - schedule when daily schedule starts
-    #   - ui when manually kicking job from BK UI
-    #       - manual kick off will be on PR or entire main branch, can be decided with BUILDKITE_BRANCH
-    bk_source = os.getenv("BUILDKITE_SOURCE")
-    bk_branch = os.getenv("BUILDKITE_BRANCH")
-    steps = generate_steps_for_scheduler(versions_yaml) if (bk_source == "schedule" or bk_branch == "main") \
-        else generate_steps_for_main_branch(versions_yaml)
->>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))
-
         # steps for snapshot version
-        snapshots = versions_json["snapshots"]
+        snapshots = versions_yaml["snapshots"]
         for snapshot_version in snapshots:
             if snapshots[snapshot_version].startswith(target_branch):
                 steps += generate_unit_and_integration_test_steps(snapshots[snapshot_version], "false")

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

@@ -6,14 +6,9 @@
 
 from ruamel.yaml import YAML
 
-<<<<<<< HEAD
-RELEASES_URL = "https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json"
-TEST_MATRIX_URL = "https://raw.githubusercontent.com/elastic/logstash-filter-elastic_integration/main/.buildkite/pull-request-test-matrix.yml"
-=======
 RELEASES_URL = "https://raw.githubusercontent.com/logstash-plugins/.ci/refs/heads/1.x/logstash-versions.yml"
 TEST_MATRIX_URL = "https://raw.githubusercontent.com/elastic/logstash-filter-elastic_integration/main/.buildkite/pull" \
                   "-request-test-matrix.yml"
->>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))
 TEST_COMMAND: typing.final = ".buildkite/scripts/run_tests.sh"
 
 

.buildkite/scripts/run_tests.sh

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-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
-=======
 #!/usr/bin/env bash
 
 export JAVA_HOME="/opt/buildkite-agent/.java/adoptiumjdk_21"
@@ -15,4 +12,3 @@ else
 fi
 
 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
->>>>>>> febb207 (Update buildkite script to look for new logstash releases location (#358))