cleanup

CSVD · Feb 7, 2020 · 58719b6 · 58719b6
1 parent 0ee7ebb
commit 58719b6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 221 deletions.
diff --git a/.env.template b/.env.template
diff --git a/demo-with-compose.sh b/demo-with-compose.sh
@@ -4,7 +4,7 @@
 #Use of this source code is governed by a BSD-2-clause-style
 #license that can be found in the LICENSE-BSD2 file or at
 #https://opensource.org/licenses/BSD-2-Clause
-docker-compose -f tests/docker-compose-ci.yml build
-docker-compose -f tests/docker-compose-ci.yml up
+docker-compose -f tests/docker-compose-script.yml build
+docker-compose -f tests/docker-compose-script.yml up
 
 EXIT=$0
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
diff --git a/test-with-compose.sh b/test-with-compose.sh
@@ -4,7 +4,8 @@
 #Use of this source code is governed by a BSD-2-clause-style
 #license that can be found in the LICENSE-BSD2 file or at
 #https://opensource.org/licenses/BSD-2-Clause
-docker-compose -f tests/docker-compose-ci.yml up --abort-on-container-exit
+docker-compose -f tests/docker-compose-script.yml build
+docker-compose -f tests/docker-compose-script.yml up --abort-on-container-exit
 
 EXIT=$0
 
diff --git a/tests/docker-compose-ci.yml b/tests/docker-compose-ci.yml
@@ -11,7 +11,6 @@ version: "3.7"
 
 services:
   test:
-    build: .
     image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:tests-${CIRCLE_SHA1}
     links:
       - splunk
@@ -20,8 +19,6 @@ services:
       - results:/work/test-results
 
   sc4s:
-    build:
-      context: ../package
     image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-${CIRCLE_SHA1}
     hostname: sc4s
     #When this is enabled test_common will fail
@@ -51,8 +48,6 @@ services:
       - SC4S_LISTEN_PFSENSE_TCP_PORT=5006
       - SC4S_ARCHIVE_GLOBAL=no
   splunk:
-    build:
-      context: ../splunk
     image: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-${CIRCLE_SHA1}
     hostname: splunk
     ports:

diff --git a/docker-compose.yml → tests/docker-compose-script.yml b/docker-compose.yml → tests/docker-compose-script.yml
@@ -11,18 +11,16 @@ version: "3.7"
 
 services:
   test:
-    build: tests
+    build: .
     links:
       - splunk
       - sc4s
-    environment:
-      - SPLUNK_USER=admin
-      - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
-      - SPLUNK_HOST=splunk
+    volumes:
+      - results:/work/test-results
 
   sc4s:
     build:
-      context: package
+      context: ../package
     hostname: sc4s
     #When this is enabled test_common will fail
     #    command: -det
@@ -31,15 +29,15 @@ services:
       - "601"
       - "514/udp"
       - "5000-5050"
-      - "5000-5200/udp"
+      - "5000-5050/udp"
       - "6514"
     stdin_open: true
     tty: true
     links:
       - splunk
     environment:
       - SPLUNK_HEC_URL=https://splunk:8088
-      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
+      - SPLUNK_HEC_TOKEN=70b6ae71-76b3-4c38-9597-0c5b37ad9630
       - SC4S_SOURCE_TLS_ENABLE=no
       - SC4S_DEST_SPLUNK_HEC_TLS_VERIFY=no
       - SC4S_LISTEN_JUNIPER_NETSCREEN_TCP_PORT=5000
@@ -50,17 +48,19 @@ services:
       - SC4S_LISTEN_PALOALTO_PANOS_TCP_PORT=5005
       - SC4S_LISTEN_PFSENSE_TCP_PORT=5006
       - SC4S_ARCHIVE_GLOBAL=no
-    volumes:
-      - ./tls:/opt/syslog-ng/tls
   splunk:
     build:
-      context: splunk
+      context: ../splunk
     hostname: splunk
     ports:
-      - "8000:8000"
+      - "8000"
       - "8088"
       - "8089"
     environment:
-      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
-      - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
+      - SPLUNK_HEC_TOKEN=70b6ae71-76b3-4c38-9597-0c5b37ad9630
+      - SPLUNK_PASSWORD=Changed@11
       - SPLUNK_START_ARGS=--accept-license
+
+volumes:
+  results:
+    external: false