Skip to content

Commit 27111e1

Browse files
committed
Remove elastic-agent side affect changes to confirm first and address separately if requires.
1 parent c40c17b commit 27111e1

File tree

2 files changed

+1
-53
lines changed

2 files changed

+1
-53
lines changed

.buildkite/scripts/e2e-pipeline/bootstrap.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -161,33 +161,9 @@ def __reload_container(self) -> None:
161161
"Error occurred while reloading Logstash container, see logs for details.")
162162
time.sleep(20) # give a time Logstash pipeline to fully start
163163

164-
def __is_version_gte(self, version: str, target_major: int, target_minor: int) -> bool:
165-
# Remove -SNAPSHOT suffix if present
166-
clean_version = version.replace("-SNAPSHOT", "")
167-
parts = clean_version.split(".")
168-
if len(parts) < 2:
169-
return False
170-
171-
try:
172-
major = int(parts[0])
173-
minor = int(parts[1])
174-
if major > target_major:
175-
return True
176-
elif major == target_major:
177-
return minor >= target_minor
178-
else:
179-
return False
180-
except ValueError:
181-
return False
182-
183164
def __update_pipeline_config(self) -> None:
184165
local_config_file_path = ".buildkite/scripts/e2e-pipeline/config/"
185-
if self.__is_version_gte(self.stack_version, 9, 3):
186-
config_file = "pipeline-ea-without-ssl.conf"
187-
elif self.project_type == "serverless":
188-
config_file = "serverless_pipeline.conf"
189-
else:
190-
config_file = "pipeline.conf"
166+
config_file = "serverless_pipeline.conf" if self.project_type == "serverless" else "pipeline.conf"
191167
local_config_file = local_config_file_path + config_file
192168
container_config_file_path = "/usr/share/logstash/pipeline/logstash.conf"
193169
# python docker client (internally uses subprocess) requires special TAR header with tar operations

.buildkite/scripts/e2e-pipeline/config/pipeline-ea-without-ssl.conf

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)