Skip to content

Commit

Permalink
Move .jenkins folder to .ci (#209)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mpdreamz authored Dec 16, 2020
1 parent 1e78b5b commit 57cb701
Show file tree
Hide file tree
Showing 28 changed files with 19 additions and 16 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions .jenkins/jobs/defaults.yml → .ci/jobs/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@
- linux
- axis:
type: yaml
filename: .jenkins/test-matrix.yml
filename: .ci/test-matrix.yml
name: STACK_VERSION
- axis:
type: yaml
filename: .jenkins/test-matrix.yml
filename: .ci/test-matrix.yml
name: GO_VERSION
- axis:
type: yaml
filename: .jenkins/test-matrix.yml
filename: .ci/test-matrix.yml
name: TEST_SUITE
yaml-strategy:
exclude-key: exclude
filename: .jenkins/test-matrix.yml
filename: .ci/test-matrix.yml
wrappers:
- ansicolor
- timeout:
Expand All @@ -69,7 +69,7 @@
builders:
- shell: |-
#!/usr/local/bin/runbld
.jenkins/run-tests
.ci/run-tests
publishers:
- email:
recipients: [email protected]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
builders:
- shell: |-
#!/usr/local/bin/runbld
.jenkins/run-benchmarks
.ci/run-benchmarks
2 changes: 1 addition & 1 deletion .jenkins/run-benchmarks → .ci/run-benchmarks
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ gcloud auth print-access-token | docker login -u oauth2accesstoken --password-st
docker tag elastic/go-elasticsearch "$CLIENT_IMAGE"
docker push "$CLIENT_IMAGE"

exec "$WORKSPACE/.jenkins/scripts/run-benchmarks.sh"
exec "$WORKSPACE/.ci/scripts/run-benchmarks.sh"
6 changes: 3 additions & 3 deletions .jenkins/run-tests → .ci/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ script_path=$(dirname $(realpath -s $0))
source $script_path/scripts/functions/imports.sh
set -euo pipefail

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

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

echo
echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
bash .jenkins/scripts/run-repository.sh
bash .ci/scripts/run-repository.sh
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if [[ -z $es_node_name ]]; then

fi

export script_path="$PWD/.jenkins"
export script_path="$PWD/.ci"
source $script_path/scripts/functions/cleanup.sh
source $script_path/scripts/functions/wait-for-container.sh
trap "cleanup_trap ${network_name}" EXIT
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ echo -e "\033[1m>>>>> EXECUTE [$TEST_SUITE] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m
status=100
case $TEST_SUITE in
"oss" )
if bash .jenkins/scripts/tests-oss.sh; then
if bash .ci/scripts/tests-oss.sh; then
status=$?
else
status=$?
fi
;;
"xpack" )
if bash .jenkins/scripts/tests-xpack.sh; then
if bash .ci/scripts/tests-xpack.sh; then
status=$?
else
status=$?
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
tmp/
*.test

#jetBrains editors
.idea
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ else
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate=certs/elasticsearch.crt")
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt")
$(eval xpack_env += --env "xpack.security.transport.ssl.verification_mode=none")
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
endif
endif
@docker network inspect elasticsearch > /dev/null 2>&1 || docker network create elasticsearch;
Expand Down

0 comments on commit 57cb701

Please sign in to comment.