From 8373eba9dfbdf54079bcb72d91162136fd295747 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Thu, 20 Feb 2020 15:15:30 -0500 Subject: [PATCH] update --- .circleci/config.yml | 8 +++++--- tests/docker-compose-ci.yml | 3 +-- tests/requirements.txt | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a568b55..c95a1bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,6 +30,8 @@ test: &test name: test command: | docker-compose -f tests/docker-compose-ci.yml build + docker-compose -f tests/docker-compose-ci.yml up -d splunk + sleep 90 docker-compose -f tests/docker-compose-ci.yml up --abort-on-container-exit no_output_timeout: 1h - run: @@ -96,21 +98,21 @@ jobs: - image: circleci/python:3.7 environment: SYSLOG: "master" - SPLUNK_VERSION: "8.0.1" + SPLUNK_VERSION: "8.0.2" <<: *test test-sc4s-3-25-1-splunk-7-3: docker: - image: circleci/python:3.7 environment: SYSLOG: "syslog-ng-3.25.1" - SPLUNK_VERSION: "7.3" + SPLUNK_VERSION: "7.3.4" <<: *test test-sc4s-3-25-1-splunk-7-2: docker: - image: circleci/python:3.7 environment: SYSLOG: "syslog-ng-3.25.1" - SPLUNK_VERSION: "7.2" + SPLUNK_VERSION: "7.2.9" <<: *test tag-alpha: diff --git a/tests/docker-compose-ci.yml b/tests/docker-compose-ci.yml index cdc6fc0..3fe2010 100644 --- a/tests/docker-compose-ci.yml +++ b/tests/docker-compose-ci.yml @@ -50,7 +50,7 @@ services: - SC4S_LISTEN_PFSENSE_TCP_PORT=5006 - SC4S_ARCHIVE_GLOBAL=no splunk: - build: + build: context: ../splunk args: - SPLUNK_VERSION=${SPLUNK_VERSION} @@ -63,7 +63,6 @@ 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 index 6a2c130..5bb5756 100644 --- 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