Skip to content

Commit 3a03f49

Browse files
committed
[CI] Run Serverless tests
1 parent adc01e3 commit 3a03f49

File tree

2 files changed

+55
-16
lines changed

2 files changed

+55
-16
lines changed

.buildkite/pipeline.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,24 @@ steps:
4141
continue_on_failure: true
4242
- label: "Log Results"
4343
command: ./.buildkite/log-results.sh
44+
- label: ":elasticsearch: Serverless :rspec: API Tests :ruby:"
45+
agents:
46+
provider: "gcp"
47+
env:
48+
RUBY_VERSION: "{{ matrix.ruby }}"
49+
TEST_SUITE: 'api'
50+
RUBY_SOURCE: "{{ matrix.ruby_source }}"
51+
QUIET: false
52+
EC_PROJECT_PREFIX: 'sl_ruby'
53+
CLOUD_CREDENTIALS_PATH: 'secret/ci/elastic-elasticsearch-serverless-ruby/cloud-access'
54+
matrix:
55+
setup:
56+
ruby:
57+
- "3.4"
58+
ruby_source:
59+
- 'ruby'
60+
adjustments:
61+
- with:
62+
ruby_source: 'jruby'
63+
ruby: '9.4'
64+
command: './.buildkite/run-serverless-tests.sh'

.buildkite/run-client.sh

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,38 @@ docker build \
2020

2121
mkdir -p elasticsearch-api/tmp
2222

23+
# TODO: Use TEST_SUITE for serverless/stack
24+
2325
echo "--- :ruby: Running $TEST_SUITE tests"
24-
docker run \
25-
-u "$(id -u)" \
26-
--network="${network_name}" \
27-
--env "TEST_ES_SERVER=${elasticsearch_url}" \
28-
--env "ELASTIC_PASSWORD=${elastic_password}" \
29-
--env "TEST_SUITE=${TEST_SUITE}" \
30-
--env "ELASTIC_USER=elastic" \
31-
--env "BUILDKITE=true" \
32-
--env "QUIET=${QUIET}" \
33-
--env "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
34-
--env "STACK_VERSION=${STACK_VERSION}" \
35-
--volume $repo:/usr/src/app \
36-
--name elasticsearch-ruby \
37-
--rm \
38-
elastic/elasticsearch-ruby \
39-
bundle exec rake es:download_artifacts test:platinum:integration test:rest_api
26+
27+
if [[ "$TEST_SUITE" == "serverless" ]]; then
28+
docker run \
29+
-e "ELASTIC_USER=elastic" \
30+
-e "BUILDKITE=true" \
31+
-e "QUIET=${QUIET}" \
32+
-e "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
33+
-e "ELASTICSEARCH_URL=${ELASTICSEARCH_URL}" \
34+
-e "API_KEY=${ES_API_SECRET_KEY}" \
35+
--volume $repo:/usr/src/app \
36+
--name elasticsearch-ruby \
37+
--rm \
38+
elastic/elasticsearch-ruby \
39+
bundle exec rake info
40+
else
41+
docker run \
42+
-u "$(id -u)" \
43+
--network="${network_name}" \
44+
--env "TEST_ES_SERVER=${elasticsearch_url}" \
45+
--env "ELASTIC_PASSWORD=${elastic_password}" \
46+
--env "TEST_SUITE=${TEST_SUITE}" \
47+
--env "ELASTIC_USER=elastic" \
48+
--env "BUILDKITE=true" \
49+
--env "QUIET=${QUIET}" \
50+
--env "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
51+
--env "STACK_VERSION=${STACK_VERSION}" \
52+
--volume $repo:/usr/src/app \
53+
--name elasticsearch-ruby \
54+
--rm \
55+
elastic/elasticsearch-ruby \
56+
bundle exec rake es:download_artifacts test:platinum:integration test:rest_api
57+
fi

0 commit comments

Comments
 (0)