Skip to content

Commit d430aec

Browse files
authored
Move make.sh to .buildkite (#2165)
1 parent 29a0e53 commit d430aec

File tree

12 files changed

+12
-142
lines changed

12 files changed

+12
-142
lines changed
File renamed without changes.

.buildkite/functions/cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Shared cleanup routines between different steps
44
#
5-
# Please source .ci/functions/imports.sh as a whole not just this file
5+
# Please source .buildkite/functions/imports.sh as a whole not just this file
66
#
77
# Version 1.0.0
88
# - Initial version after refactor

.buildkite/functions/wait-for-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Exposes a routine scripts can call to wait for a container if that container set up a health command
44
#
5-
# Please source .ci/functions/imports.sh as a whole not just this file
5+
# Please source .buildkite/functions/imports.sh as a whole not just this file
66
#
77
# Version 1.0.1
88
# - Initial version after refactor
File renamed without changes.

.ci/make.sh renamed to .buildkite/make.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Build entry script for elasticsearch-js
55
#
6-
# Must be called: ./.ci/make.sh <target> <params>
6+
# Must be called: ./.buildkite/make.sh <target> <params>
77
#
88
# Version: 1.1.0
99
#
@@ -34,8 +34,8 @@ STACK_VERSION=$VERSION
3434
set -euo pipefail
3535

3636
product="elastic/elasticsearch-js"
37-
output_folder=".ci/output"
38-
codegen_folder=".ci/output"
37+
output_folder=".buildkite/output"
38+
codegen_folder=".buildkite/output"
3939
OUTPUT_DIR="$repo/${output_folder}"
4040
NODE_JS_VERSION=18
4141
WORKFLOW=${WORKFLOW-staging}
@@ -131,7 +131,7 @@ esac
131131
echo -e "\033[34;1mINFO: building $product container\033[0m"
132132

133133
docker build \
134-
--file .ci/Dockerfile \
134+
--file .buildkite/Dockerfile-make \
135135
--tag "$product" \
136136
--build-arg NODE_JS_VERSION="$NODE_JS_VERSION" \
137137
--build-arg "BUILDER_UID=$(id -u)" \
@@ -156,7 +156,7 @@ if [[ -z "${BUILDKITE+x}" ]] && [[ -z "${CI+x}" ]] && [[ -z "${GITHUB_ACTIONS+x}
156156
--rm \
157157
$product \
158158
/bin/bash -c "mkdir -p /usr/src/elastic-client-generator-js/output && \
159-
node .ci/make.mjs --task $TASK ${TASK_ARGS[*]}"
159+
node .buildkite/make.mjs --task $TASK ${TASK_ARGS[*]}"
160160
else
161161
echo -e "\033[34;1mINFO: Running in CI mode"
162162
docker run \
@@ -171,15 +171,15 @@ else
171171
git clone https://$CLIENTS_GITHUB_TOKEN@github.com/elastic/elastic-client-generator-js.git && \
172172
mkdir -p /usr/src/elastic-client-generator-js/output && \
173173
cd /usr/src/elasticsearch-js && \
174-
node .ci/make.mjs --task $TASK ${TASK_ARGS[*]}"
174+
node .buildkite/make.mjs --task $TASK ${TASK_ARGS[*]}"
175175
fi
176176

177177
# ------------------------------------------------------- #
178178
# Post Command tasks & checks
179179
# ------------------------------------------------------- #
180180

181181
if [[ "$CMD" == "assemble" ]]; then
182-
if compgen -G ".ci/output/*" > /dev/null; then
182+
if compgen -G ".buildkite/output/*" > /dev/null; then
183183
echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m"
184184
else
185185
echo -e "\033[31;1mTARGET: assemble failed, empty workspace!\033[0m"

.buildkite/pull-requests.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"\\.md$",
1010
"\\.asciidoc$",
1111
"^docs\\/",
12-
"^\\.ci\\/",
1312
"^scripts\\/",
1413
"^catalog-info\\.yaml$",
1514
"^test\\/unit\\/",

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
filters: |
1919
src-only:
20-
- '!(**/*.{md,asciidoc,txt}|*.{md,asciidoc,txt}|{docs,.ci,.buildkite,scripts}/**/*|catalog-info.yaml)'
20+
- '!(**/*.{md,asciidoc,txt}|*.{md,asciidoc,txt}|{docs,.buildkite,scripts}/**/*|catalog-info.yaml)'
2121
- '.github/workflows/**'
2222
2323
test:

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ test
6464
scripts
6565

6666
# ci configuration
67-
.ci
6867
.travis.yml
6968
.buildkite
7069
certs

Makefile

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

scripts/es-docker-platinum.sh

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

scripts/es-docker.sh

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

test/integration/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The specification does not allow the test to be run in parallel, so it might tak
2323
### Running locally
2424

2525
If you want to run the integration tests on your development machine, you must have an Elasticsearch instance running first.
26-
A local instance can be spun up in a Docker container by running the [`.ci/run-elasticsearch.sh`](/.ci/run-elasticsearch.sh) script.
26+
A local instance can be spun up in a Docker container by running the [`.buildkite/run-elasticsearch.sh`](/.buildkite/run-elasticsearch.sh) script.
2727
This is the same script CI jobs use to run Elasticsearch for integration tests, so your results should be relatively consistent.
2828

2929
To simplify the process of starting a container, testing, and cleaning up the container, you can run the `make integration` target:
@@ -35,7 +35,7 @@ export TEST_SUITE=free # can be `free` or `platinum`
3535
make integration
3636
```
3737

38-
If Elasticsearch doesn't come up, run `make integration-cleanup` and then `DETACH=false .ci/run-elasticsearch.sh` manually to read the startup logs.
38+
If Elasticsearch doesn't come up, run `make integration-cleanup` and then `DETACH=false .buildkite/run-elasticsearch.sh` manually to read the startup logs.
3939

4040
If you get an error about `vm.max_map_count` being too low, run `sudo sysctl -w vm.max_map_count=262144` to update the setting until the next reboot, or `sudo sysctl -w vm.max_map_count=262144; echo 'vm.max_map_count=262144' | sudo tee -a /etc/sysctl.conf` to update the setting permanently.
4141

0 commit comments

Comments
 (0)