Skip to content

Fix the CI failures after version definitions in .ci repo. #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsvd merged 1 commit into from
Nov 19, 2024
Merged

Fix the CI failures after version definitions in .ci repo. #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .buildkite/build-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,19 @@ steps:
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
SNAPSHOT: false
INTEGRATION: true
SECURE_INTEGRATION: true
TARGET_BRANCH: "8.x"
# temporary definition to cover PR-170
# TODO: remove once 8.16 released
ELASTICSEARCH_TREEISH: 8.16

- label: ":hammer: Build plugin with LS 8.x-SNAPSHOT & ES `main` branch :elasticsearch:"
# Builds with LS last 8.x released version and ES main
# Runs integration tests on 8.x released versions
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
ELASTICSEARCH_TREEISH: "main"
SNAPSHOT: true
INTEGRATION: true
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/e2e-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
command:
- .buildkite/scripts/run_e2e_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
TARGET_BRANCH: "8.x"

- label: ":test_tube: Run E2E tests with LS 8.x-SNAPSHOT :rocket:"
Expand All @@ -24,7 +24,7 @@ steps:
command:
- .buildkite/scripts/run_e2e_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
SNAPSHOT: true

- label: ":test_tube: Run E2E tests with LS `main` :rocket:"
Expand Down
13 changes: 5 additions & 8 deletions .buildkite/pull-request-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
SNAPSHOT: true
INTEGRATION: false

Expand All @@ -22,7 +22,7 @@ steps:
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
ELASTICSEARCH_TREEISH: main
INTEGRATION: false
SNAPSHOT: true
Expand All @@ -34,20 +34,17 @@ steps:
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
INTEGRATION: true
SECURE_INTEGRATION: true
# temporary definition to cover PR-170
# TODO: remove once 8.16 released
ELASTICSEARCH_TREEISH: 8.16

- label: ":hammer: Integration tests with LS & ES 8.x-SNAPSHOT :docker:"
# Builds the plugin (with current changes) against LS 8.x-SNAPSHOT and ES version defined in gradle.properties
# Runs integration tests on LS & ES 8.x-SNAPSHOT docker
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
SNAPSHOT: true
INTEGRATION: true
SECURE_INTEGRATION: true
Expand All @@ -59,7 +56,7 @@ steps:
command:
- .buildkite/scripts/run_tests.sh
env:
ELASTIC_STACK_VERSION: "8.x"
ELASTIC_STACK_VERSION: "8.current"
ELASTICSEARCH_TREEISH: "main"
SNAPSHOT: true
INTEGRATION: true
Expand Down
4 changes: 2 additions & 2 deletions .ci/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd .ci
export BUILDKIT_PROGRESS=plain

if [ "$INTEGRATION" == "true" ]; then
docker-compose up --exit-code-from logstash
docker compose up --exit-code-from logstash
else
docker-compose up --exit-code-from logstash logstash
docker compose up --exit-code-from logstash logstash
fi
8 changes: 4 additions & 4 deletions .ci/docker-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ if [ "$ELASTIC_STACK_VERSION" ]; then
export BUILDKIT_PROGRESS=plain

if [ "$INTEGRATION" == "true" ]; then
docker-compose down
docker-compose build
docker compose down
docker compose build
else
docker-compose down
docker-compose build logstash
docker compose down
docker compose build logstash
fi
else
echo "Please set the ELASTIC_STACK_VERSION environment variable"
Expand Down