tests: use es7 via docker instead of es6

datadope-io · Jul 3, 2020 · 5a7c973 · 5a7c973
1 parent 38c52a7
commit 5a7c973
Show file tree

Hide file tree

Showing 10 changed files with 5,188 additions and 110 deletions.
diff --git a/agent/agent_easyjson.go b/agent/agent_easyjson.go
diff --git a/analyzer/server_easyjson.go b/analyzer/server_easyjson.go
diff --git a/coverage.sh b/coverage.sh
@@ -42,7 +42,7 @@ generate_cover_data() {
     if [ "$scale" -eq 1 ]; then
         # scale test
         export SKYDIVE_ANALYZERS=localhost:8082
-        export ELASTICSEARCH=localhost:9200
+        export ELASTICSEARCH=localhost:9201
         export TLS=true
         coverfile="../$workdir/scale.cover"
         export SKYDIVE="${GOPATH}/src/github.com/skydive-project/skydive/scripts/skydive_coverage.sh"

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -67,8 +67,7 @@ if [ "x$PUBLIC_INTERFACE" != "x" ]; then
     SKYDIVE_PUBLIC_INTERFACES=${SKYDIVE_PUBLIC_INTERFACES:-$LOCAL_HOSTNAME/$PUBLIC_INTERFACE}
 fi
 
-ELASTICSEARCH_BASE_URL=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution
-ELASTICSEARCH_VERSION=5.6.14
+ELASTICSEARCH_VERSION=7.8.0
 
 USE_ELASTICSEARCH=0
 if [ "${SKYDIVE_FLOWS_STORAGE}" == "elasticsearch" ] || [ "${SKYDIVE_GRAPH_STORAGE}" == "elasticsearch" ]; then
@@ -107,10 +106,10 @@ function install_go {
 function download_elasticsearch {
     if [ ! -f ${TOP_DIR}/files/elasticsearch-${ELASTICSEARCH_VERSION}.* ]; then
         if is_ubuntu; then
-            wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.deb \
+            wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}-amd64.deb \
                 -O ${TOP_DIR}/files/elasticsearch-${ELASTICSEARCH_VERSION}.deb
         elif is_fedora; then
-            wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.rpm \
+            wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}-x86_64.rpm \
                 -O ${TOP_DIR}/files/elasticsearch-${ELASTICSEARCH_VERSION}.noarch.rpm
         fi
     fi