Skip to content

Commit baff266

Browse files
committed
[CI] Updates Buildkite run
1 parent 4ff82c7 commit baff266

File tree

2 files changed

+11
-48
lines changed

2 files changed

+11
-48
lines changed

.buildkite/pipeline.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,3 @@ steps:
2323
ruby_source: 'jruby'
2424
ruby: '9.4'
2525
command: './.buildkite/run-tests.sh'
26-
- label: ':elasticsearch: Serverless :otel: OpenTelemetry Tests :ruby: {{ matrix.ruby_source}}:{{ matrix.ruby }}'
27-
agents:
28-
provider: 'gcp'
29-
env:
30-
RUBY_VERSION: "{{ matrix.ruby }}"
31-
TEST_SUITE: 'otel'
32-
RUBY_SOURCE: "{{ matrix.ruby_source }}"
33-
EC_PROJECT_PREFIX: 'sl_ruby'
34-
CLOUD_CREDENTIALS_PATH: 'secret/ci/elastic-elasticsearch-serverless-ruby/cloud-access'
35-
matrix:
36-
setup:
37-
ruby:
38-
- "3.3"
39-
ruby_source:
40-
- 'ruby'
41-
adjustments:
42-
- with:
43-
ruby_source: 'jruby'
44-
ruby: '9.4'
45-
command: './.buildkite/run-tests.sh'

.buildkite/run-client.sh

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,14 @@ docker build \
1919

2020
echo "--- :ruby: Running $TEST_SUITE tests"
2121

22-
if [[ "$TEST_SUITE" == "api" ]]; then
23-
docker run \
24-
-e "TEST_SUITE=${TEST_SUITE}" \
25-
-e "ELASTIC_USER=elastic" \
26-
-e "BUILDKITE=true" \
27-
-e "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
28-
-e "ELASTICSEARCH_URL=${ELASTICSEARCH_URL}" \
29-
-e "API_KEY=${ES_API_SECRET_KEY}" \
30-
--volume $repo:/usr/src/app \
31-
--name elasticsearch-ruby \
32-
--rm \
33-
elastic/elasticsearch-ruby \
34-
bundle exec rake info spec:api spec:stack spec:download_tests spec:yaml
35-
elif [[ "$TEST_SUITE" == "otel" ]]; then
36-
docker run \
37-
-e "TEST_SUITE=${TEST_SUITE}" \
38-
-e "ELASTIC_USER=elastic" \
39-
-e "BUILDKITE=true" \
40-
-e "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
41-
-e "ELASTICSEARCH_URL=${ELASTICSEARCH_URL}" \
42-
-e "API_KEY=${ES_API_SECRET_KEY}" \
43-
-e "TEST_WITH_OTEL=true" \
44-
--volume $repo:/usr/src/app \
45-
--name elasticsearch-ruby \
46-
--rm \
47-
elastic/elasticsearch-ruby \
48-
bundle exec rake spec:otel
49-
fi
22+
docker run \
23+
-e "ELASTIC_USER=elastic" \
24+
-e "BUILDKITE=true" \
25+
-e "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
26+
-e "ELASTICSEARCH_URL=${ELASTICSEARCH_URL}" \
27+
-e "API_KEY=${ES_API_SECRET_KEY}" \
28+
--volume $repo:/usr/src/app \
29+
--name elasticsearch-ruby \
30+
--rm \
31+
elastic/elasticsearch-ruby \
32+
bundle exec rake info spec:otel spec:api spec:stack spec:download_tests spec:yaml

0 commit comments

Comments
 (0)