Skip to content

Commit

Permalink
remove ES5 support (#1419)
Browse files Browse the repository at this point in the history
ES5 EOL was reached a long time ago and all tests should happen on the last version ES7 (potentially ES8 in a close future)
I also want to try some ES7 features that would require to find a backward compatibility with ES5 that might be impossible (and not useful to maintain).
  • Loading branch information
ereteog authored Apr 24, 2024
1 parent ac5291d commit 358a28e
Show file tree
Hide file tree
Showing 31 changed files with 159 additions and 583 deletions.
15 changes: 0 additions & 15 deletions containers/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,6 @@ services:
image: redis:5.0.5
ports:
- "6379:6379"
elasticsearch5:
image: elasticsearch:5.6.11
environment:
- cluster.name=elasticsearch5
- discovery.type=single-node
ports:
- "9205:9200"
- "9305:9300"
# workaround to reset default elasticsearch 5 password in docker cluster
set-elasticsearch5-password:
build: ./elasticsearch5-password
depends_on:
- elasticsearch5
environment:
- ELASTIC_PASSWORD=ductile
elasticsearch7:
image: elasticsearch:7.9.2
environment:
Expand Down
9 changes: 0 additions & 9 deletions containers/dev/elasticsearch5-password/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions containers/dev/elasticsearch5-password/entrypoint.sh

This file was deleted.

185 changes: 0 additions & 185 deletions containers/dev/elasticsearch5-password/wait-for-it.sh

This file was deleted.

3 changes: 0 additions & 3 deletions containers/dev/m1-docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '2'
services:

elasticsearch5:
build: ./m1-images/elasticsearch5

elasticsearch7:
image: elasticsearch:7.9.2
environment:
Expand Down
45 changes: 0 additions & 45 deletions containers/dev/m1-images/elasticsearch5/Dockerfile

This file was deleted.

41 changes: 0 additions & 41 deletions containers/dev/m1-images/elasticsearch5/bin/es-docker

This file was deleted.

9 changes: 0 additions & 9 deletions containers/dev/m1-images/elasticsearch5/elasticsearch.yml

This file was deleted.

9 changes: 0 additions & 9 deletions containers/dev/m1-images/elasticsearch5/log4j2.properties

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion dev/ctia/dev/split_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
(format "until curl http://127.0.0.1:920%s; do sleep 1; " version)
exit-if-too-long " ; done"))
(assert-sh "Error connecting to docker")))]
(wait-es 5)
(wait-es 7)
; Wait Kafka
(-> (sh/sh "bash" "-c"
Expand Down
3 changes: 0 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@

:prepush {:plugins [[yogsototh/lein-kibit "0.1.6-SNAPSHOT"]
[lein-bikeshed "0.3.0"]]}
:es5 {:jvm-opts ["-Dctia.store.es.default.port=9205"
"-Dctia.store.es.default.version=5"
"-Dctia.test.es-versions=[5]"]}
:es7 {:jvm-opts ["-Dctia.store.es.default.port=9207"
"-Dctia.store.es.default.version=7"
"-Dctia.test.es-versions=[7]"]}}
Expand Down
4 changes: 2 additions & 2 deletions resources/ctia-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ ctia.events.log=false

# Use ES for all Stores
ctia.store.es.default.host=127.0.0.1
ctia.store.es.default.port=9205
ctia.store.es.default.port=9207
ctia.store.es.default.version=7
#ctia.store.es.default.host=es-storage.int.iroh.site
#ctia.store.es.default.port=443
#ctia.store.es.default.protocol=https
Expand All @@ -80,7 +81,6 @@ ctia.store.es.default.refresh=false
ctia.store.es.default.rollover.max_docs=10000000
ctia.store.es.default.aliased=true
ctia.store.es.default.allow_partial_search_results=false
ctia.store.es.default.version=5
ctia.store.es.default.update-mappings=false
ctia.store.es.default.update-settings=false
ctia.store.es.default.refresh-mappings=false
Expand Down
Loading

0 comments on commit 358a28e

Please sign in to comment.