version fix

CSVD · Feb 20, 2020 · 3573937 · 3573937
1 parent 26199bb
commit 3573937
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -89,28 +89,28 @@ jobs:
       - image: circleci/python:3.7
     environment:
       SYSLOG: "syslog-ng-3.25.1"
-      SPLUNK: "8.0"
+      SPLUNK_VERSION: "8.0"
     <<: *test
   test-sc4s-master-splunk-8-0:
     docker:
       - image: circleci/python:3.7
     environment:
       SYSLOG: "master"
-      SPLUNK: "8.0"
+      SPLUNK_VERSION: "8.0"
     <<: *test
   test-sc4s-3-25-1-splunk-7-3:
     docker:
       - image: circleci/python:3.7
     environment:
       SYSLOG: "syslog-ng-3.25.1"
-      SPLUNK: "7.3"
+      SPLUNK_VERSION: "7.3"
     <<: *test
   test-sc4s-3-25-1-splunk-7-2:
     docker:
       - image: circleci/python:3.7
     environment:
       SYSLOG: "syslog-ng-3.25.1"
-      SPLUNK: "7.2"
+      SPLUNK_VERSION: "7.2"
     <<: *test
 
   tag-alpha:

diff --git a/tests/docker-compose-ci.yml b/tests/docker-compose-ci.yml
@@ -50,7 +50,10 @@ services:
       - SC4S_LISTEN_PFSENSE_TCP_PORT=5006
       - SC4S_ARCHIVE_GLOBAL=no
   splunk:
-    build: ../splunk
+    build: 
+      context: ../splunk
+      args:
+        - SPLUNK_VERSION=${SPLUNK_VERSION}
     hostname: splunk
     ports:
       - "8000"
@@ -60,6 +63,7 @@ services:
       - SPLUNK_HEC_TOKEN=70b6ae71-76b3-4c38-9597-0c5b37ad9630
       - SPLUNK_PASSWORD=Changed@11
       - SPLUNK_START_ARGS=--accept-license
+
 
 volumes:
   results:

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -9,7 +9,7 @@
 pytest
 jinja2
 jinja2-time
-splunk-sdk==1.6.11
+splunk-sdk
 flake8
 pytz
 flaky