From debf000aff54e9d70479efee5bb6468c1eb6c2d8 Mon Sep 17 00:00:00 2001
From: rfaircloth-splunk <rfaircloth@splunk.com>
Date: Wed, 5 Feb 2020 15:27:44 -0500
Subject: [PATCH] updates

---
 .circleci/config.yml     | 36 ++++++++++++++++++++++++++++++++++++
 tests/docker-compose.yml | 19 ++++++++-----------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cec364c..60fe175 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,6 +50,30 @@ build-splunk: &build-splunk
           docker push \
             docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SYSLOG}-<< pipeline.id >>
 
+
+test: &test
+  steps:
+    - checkout
+    - setup_remote_docker:
+        docker_layer_caching: true
+    - run:
+        name: Docker Login
+        command: |
+          docker login -u $DOCKER_USER -p $DOCKER_PASS
+          docker login -u $GITHUB_USER -p $GITHUB_TOKEN docker.pkg.github.com
+    - run:
+        name: Setup for testing
+        command: |
+          pip3 -r tests/requirements.txt
+    - run:
+        name: test
+        command: |
+          pytest --splunk_type=docker --splunk_password=${SPLUNK_PASSWORD}
+        env:
+          IMAGE_SC4S: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-<< pipeline.id >>
+          IMAGE_SPLUNK: docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SYSLOG}-<< pipeline.id >>
+
+
 orbs:
   docker: circleci/docker@0.5.20
   go: circleci/go@0.2.0
@@ -90,6 +114,13 @@ jobs:
     environment:
       SPLUNK: '8.0'
     <<: *build-splunk
+  test-sc4s-3-25-1-splunk-8-0:
+    docker:
+      - image: circleci/buildpack-deps:18.04
+    environment:
+      SYSLOG: '3.25.1'
+      SPLUNK: '8.0'
+    <<: *build-splunk
 
 workflows:
   version: 2
@@ -100,3 +131,8 @@ workflows:
       - build-splunk-7-2
       - build-splunk-7-3
       - build-splunk-8-0
+      - test-sc4s-3-25-1-splunk-8-0:
+          requires:
+            - build-sc4s-3-25-1
+            - build-splunk-8-0
+
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 26ccd0a..f4fdca8 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -12,14 +12,13 @@ version: "3.7"
 services:
 
   sc4s:
-    build:
-      context: ../package
+    image: ${IMAGE_SC4S}
     #When this is enabled test_common will fail
     #    command: -det
     ports:
-      - "514:514"
+      - "514"
       - "601"
-      - "514:514/udp"
+      - "514/udp"
       - "5000-5050"
       - "5000-5200/udp"
       - "6514"
@@ -29,7 +28,7 @@ services:
       - splunk
     environment:
       - SPLUNK_HEC_URL=https://splunk:8088
-      - SPLUNK_HEC_TOKEN=3533e4bd-3eeb-4c57-aa6b-3151116a01d9
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
       - SC4S_SOURCE_TLS_ENABLE=no
       - SC4S_DEST_SPLUNK_HEC_TLS_VERIFY=no
       #     - SC4S_LISTEN_DEFAULT_TCP_PORT=514
@@ -47,16 +46,14 @@ services:
     volumes:
       - ./tls:/opt/syslog-ng/tls
   splunk:
-    build:
-      context: ../splunk
-
+    image: ${IMAGE_SPLUNK}
 
     ports:
       - "8000"
-      - "8088:8088"
-      - "8089:8089"
+      - "8088"
+      - "8089"
     environment:
-      - SPLUNK_HEC_TOKEN=3533e4bd-3eeb-4c57-aa6b-3151116a01d9
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
       - SPLUNK_START_ARGS=--accept-license