update

CSVD · Feb 11, 2020 · 3f9a904 · 3f9a904
1 parent 9052cb3
commit 3f9a904
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -94,7 +94,7 @@ jobs:
     docker:
       - image: circleci/python:3.7
     environment:
-      SYSLOG: "3.25.1"
+      SYSLOG: "syslog-ng- 3.25.1"
       SPLUNK: "8.0"
     <<: *test
   test-sc4s-master-splunk-8-0:
@@ -108,22 +108,22 @@ jobs:
     docker:
       - image: circleci/python:3.7
     environment:
-      SYSLOG: "3.25.1"
+      SYSLOG: "syslog-ng-3.25.1"
       SPLUNK: "7.3"
     <<: *test
   test-sc4s-3-25-1-splunk-7-2:
     docker:
       - image: circleci/python:3.7
     environment:
-      SYSLOG: "3.25.1"
+      SYSLOG: "syslog-ng-3.25.1"
       SPLUNK: "7-2"
     <<: *test
 
   publish-edge:
     docker:
       - image: circleci/python:3.7
     environment:
-      SYSLOG: "3.25.1"
+      SYSLOG: "syslog-ng-3.25.1"
       SPLUNK: "8.0"
       DOCKER_TAG: edge
       GHR_FLAGS: -prerelease
@@ -132,7 +132,7 @@ jobs:
     docker:
       - image: circleci/python:3.7
     environment:
-      SYSLOG: "3.25.1"
+      SYSLOG: "syslog-ng-3.25.1"
       SPLUNK: "8.0"
       DOCKER_TAG: latest
     <<: *publish

diff --git a/tests/docker-compose-ci.yml b/tests/docker-compose-ci.yml
@@ -19,7 +19,10 @@ services:
       - results:/work/test-results
 
   sc4s:
-    build: ../package
+    build: 
+      context: ../package
+      args: 
+        - BRANCH: ${SYSLOG}
     hostname: sc4s
     #When this is enabled test_common will fail
     #    command: -det