Remove 2x environments (#5967)

As by now 6.x releases are out, I removed the 2.x environments we used for manual testing. They are not needed anymore and were not used for quite some time. This also removed some of the Dockerfile which now makes it possible to rely on only 1 Docker file for the different versions of the pieces in the Elastic Stack.
elastic · Jan 4, 2018 · fd0e654 · fd0e654
1 parent 1622c24
commit fd0e654
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 216 deletions.
diff --git a/testing/environments/2x.yml b/testing/environments/2x.yml
diff --git a/.../docker/elasticsearch/Dockerfile-snapshot → ...ironments/docker/elasticsearch/Dockerfile b/.../docker/elasticsearch/Dockerfile-snapshot → ...ironments/docker/elasticsearch/Dockerfile
diff --git a/testing/environments/docker/elasticsearch/Dockerfile-2x b/testing/environments/docker/elasticsearch/Dockerfile-2x
diff --git a/testing/environments/docker/elasticsearch/docker-entrypoint.sh b/testing/environments/docker/elasticsearch/docker-entrypoint.sh
diff --git a/...onments/docker/kibana/Dockerfile-snapshot → ...ing/environments/docker/kibana/Dockerfile b/...onments/docker/kibana/Dockerfile-snapshot → ...ing/environments/docker/kibana/Dockerfile
diff --git a/testing/environments/docker/kibana/Dockerfile-4.6 b/testing/environments/docker/kibana/Dockerfile-4.6
diff --git a/testing/environments/docker/kibana/docker-entrypoint.sh b/testing/environments/docker/kibana/docker-entrypoint.sh
diff --git a/testing/environments/docker/logstash/Dockerfile-2x b/testing/environments/docker/logstash/Dockerfile-2x
diff --git a/testing/environments/docker/logstash/setup.sh b/testing/environments/docker/logstash/setup.sh
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
@@ -8,7 +8,7 @@ services:
       service: args
     build:
       context: ./docker/elasticsearch
-      dockerfile: Dockerfile-snapshot
+      dockerfile: Dockerfile
       args:
         XPACK: 1
     environment:
@@ -34,6 +34,6 @@ services:
       service: args
     build:
       context: ./docker/kibana
-      dockerfile: Dockerfile-snapshot
+      dockerfile: Dockerfile
       args:
         XPACK: 1