Skip to content

Commit 57cb701

Browse files
authored
Move .jenkins folder to .ci (#209)
1 parent 1e78b5b commit 57cb701

28 files changed

+19
-16
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.jenkins/jobs/defaults.yml .ci/jobs/defaults.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
- linux
4646
- axis:
4747
type: yaml
48-
filename: .jenkins/test-matrix.yml
48+
filename: .ci/test-matrix.yml
4949
name: STACK_VERSION
5050
- axis:
5151
type: yaml
52-
filename: .jenkins/test-matrix.yml
52+
filename: .ci/test-matrix.yml
5353
name: GO_VERSION
5454
- axis:
5555
type: yaml
56-
filename: .jenkins/test-matrix.yml
56+
filename: .ci/test-matrix.yml
5757
name: TEST_SUITE
5858
yaml-strategy:
5959
exclude-key: exclude
60-
filename: .jenkins/test-matrix.yml
60+
filename: .ci/test-matrix.yml
6161
wrappers:
6262
- ansicolor
6363
- timeout:
@@ -69,7 +69,7 @@
6969
builders:
7070
- shell: |-
7171
#!/usr/local/bin/runbld
72-
.jenkins/run-tests
72+
.ci/run-tests
7373
publishers:
7474
- email:
7575
recipients: build-lang-clients@elastic.co

.jenkins/jobs/elastic+go-elasticsearch+benchmarks.yml .ci/jobs/elastic+go-elasticsearch+benchmarks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
builders:
1818
- shell: |-
1919
#!/usr/local/bin/runbld
20-
.jenkins/run-benchmarks
20+
.ci/run-benchmarks

.jenkins/run-benchmarks .ci/run-benchmarks

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ gcloud auth print-access-token | docker login -u oauth2accesstoken --password-st
3737
docker tag elastic/go-elasticsearch "$CLIENT_IMAGE"
3838
docker push "$CLIENT_IMAGE"
3939

40-
exec "$WORKSPACE/.jenkins/scripts/run-benchmarks.sh"
40+
exec "$WORKSPACE/.ci/scripts/run-benchmarks.sh"

.jenkins/run-tests .ci/run-tests

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ script_path=$(dirname $(realpath -s $0))
88
source $script_path/scripts/functions/imports.sh
99
set -euo pipefail
1010

11-
DETACH=true bash .jenkins/scripts/run-elasticsearch.sh
11+
DETACH=true bash .ci/scripts/run-elasticsearch.sh
1212

1313
if [[ -n "$RUNSCRIPTS" ]]; then
1414
for RUNSCRIPT in ${RUNSCRIPTS//,/ } ; do
1515
echo -e "\033[1m>>>>> Running run-$RUNSCRIPT.sh >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
1616
CONTAINER_NAME=${RUNSCRIPT} \
1717
DETACH=true \
18-
bash .jenkins/scripts/run-${RUNSCRIPT}.sh
18+
bash .ci/scripts/run-${RUNSCRIPT}.sh
1919
done
2020
fi
2121

2222
echo
2323
echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
24-
bash .jenkins/scripts/run-repository.sh
24+
bash .ci/scripts/run-repository.sh
File renamed without changes.

.jenkins/scripts/functions/imports.sh .ci/scripts/functions/imports.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [[ -z $es_node_name ]]; then
4444

4545
fi
4646

47-
export script_path="$PWD/.jenkins"
47+
export script_path="$PWD/.ci"
4848
source $script_path/scripts/functions/cleanup.sh
4949
source $script_path/scripts/functions/wait-for-container.sh
5050
trap "cleanup_trap ${network_name}" EXIT
File renamed without changes.
File renamed without changes.

.jenkins/scripts/run-repository.sh .ci/scripts/run-repository.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ echo -e "\033[1m>>>>> EXECUTE [$TEST_SUITE] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m
8989
status=100
9090
case $TEST_SUITE in
9191
"oss" )
92-
if bash .jenkins/scripts/tests-oss.sh; then
92+
if bash .ci/scripts/tests-oss.sh; then
9393
status=$?
9494
else
9595
status=$?
9696
fi
9797
;;
9898
"xpack" )
99-
if bash .jenkins/scripts/tests-xpack.sh; then
99+
if bash .ci/scripts/tests-xpack.sh; then
100100
status=$?
101101
else
102102
status=$?
File renamed without changes.
File renamed without changes.
File renamed without changes.

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
tmp/
22
*.test
3+
4+
#jetBrains editors
5+
.idea

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ else
276276
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate=certs/elasticsearch.crt")
277277
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt")
278278
$(eval xpack_env += --env "xpack.security.transport.ssl.verification_mode=none")
279-
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
280-
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
281-
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
279+
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
280+
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
281+
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
282282
endif
283283
endif
284284
@docker network inspect elasticsearch > /dev/null 2>&1 || docker network create elasticsearch;

0 commit comments

Comments
 (0)