From 3f9a904bb17b045e2010ff04c15c826daa928f7c Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Mon, 10 Feb 2020 19:00:25 -0500 Subject: [PATCH] update --- .circleci/config.yml | 10 +++++----- tests/docker-compose-ci.yml | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6be7f68..1e7e9a9 100644 --- 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,14 +108,14 @@ 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 @@ -123,7 +123,7 @@ jobs: 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 index cb5f09d..cc59c46 100644 --- 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