Updated ci config

Author: delvedor

.ci/docker-compose.yml

@@ -23,7 +23,6 @@ services:
 
   elasticsearch-oss:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:-5.6.15}
-      - elasticsearch
     volumes:
       - esvol:/tmp
     networks:
@@ -33,63 +32,11 @@ services:
       - "repositories.url.allowed_urls=http://snapshot.*"
       - node.attr.testattr=test
       - bootstrap.memory_lock=false
+      - "xpack.security.enabled=false"
       - "discovery.type=single-node"
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
-  client-platinum:
-    image: docker.elastic.co/clients/elasticsearch-js:${NODE_JS_VERSION:-10}
-    build:
-      context: ..
-      dockerfile: .ci/Dockerfile
-      args:
-          NODE_JS_VERSION: ${NODE_JS_VERSION:-10}
-    environment:
-      - "TEST_ES_SERVER=https://elastic:changeme@elasticsearch-platinum:9200"
-    volumes:
-      - ..:/usr/src/app
-      # This will mount the node_modules directory
-      # to the host machine using the buildtime directory.
-      - /usr/src/app/node_modules
-      - esvol:/tmp
-    networks:
-      - esnet-platinum
-    depends_on:
-      - elasticsearch-platinum
-    # there is not need to run again also the unit test
-    command: ["npm", "run", "test:integration"]
-
-  elasticsearch-platinum:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION:5.6.15}
-    ports:
-      - "9200:9200"
-    networks:
-      - esnet-platinum
-    environment:
-      - "node.attr.testattr=test"
-      - "path.repo=/tmp"
-      - "repositories.url.allowed_urls=http://snapshot.*"
-      - "discovery.type=single-node"
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
-      - "ELASTIC_PASSWORD=changeme"
-      - "xpack.security.enabled=true"
-      - "xpack.license.self_generated.type=trial"
-      - "xpack.security.http.ssl.enabled=true"
-      - "xpack.security.http.ssl.verification_mode=certificate"
-      - "xpack.security.http.ssl.key=certs/testnode.key"
-      - "xpack.security.http.ssl.certificate=certs/testnode.crt"
-      - "xpack.security.http.ssl.certificate_authorities=certs/ca.crt"
-      - "xpack.security.transport.ssl.enabled=true"
-      - "xpack.security.transport.ssl.key=certs/testnode.key"
-      - "xpack.security.transport.ssl.certificate=certs/testnode.crt"
-      - "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt"
-    volumes:
-      - "./certs/testnode.crt:/usr/share/elasticsearch/config/certs/testnode.crt"
-      - "./certs/testnode.key:/usr/share/elasticsearch/config/certs/testnode.key"
-      - "./certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt"
-
 networks:
-  # we need two networks otherwise the two ES instances will join each other
   esnet-oss:
-  esnet-platinum:
 volumes:
   esvol:

.ci/run-tests

@@ -17,5 +17,3 @@ unset VAULT_ROLE_ID VAULT_SECRET_ID VAULT_TOKEN
 set -x
 
 ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION} NODE_JS_VERSION=${NODE_JS_VERSION} docker-compose -f .ci/docker-compose.yml run client-oss
-
-ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION} NODE_JS_VERSION=${NODE_JS_VERSION} docker-compose -f .ci/docker-compose.yml run client-platinum