From 609df447f63beb3cd516c90df47d5195398799ef Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 4 Feb 2020 19:59:39 -0500 Subject: [PATCH] updates --- .github/workflows/test_matrix.yml | 2 +- splunk/Dockerfile | 3 +-- tests/conftest.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_matrix.yml b/.github/workflows/test_matrix.yml index 7476a54..f37806c 100644 --- a/.github/workflows/test_matrix.yml +++ b/.github/workflows/test_matrix.yml @@ -40,7 +40,7 @@ jobs: --rootdir=$(pwd) \ --splunk_type=docker \ --splunk_version=${{ matrix.splunk-version }} \ - --splunk_password=${{ secrets.GitHub_PAT }}@11 + --splunk_password=${{ secrets.GitHub_PAT }} env: SPLUNKBASE_PASSWORD: ${{ secrets.SPLUNKBASE_PASSWORD }} SPLUNK_HEC_TOKEN: ${{ secrets.SPLUNK_HEC_TOKEN }} diff --git a/splunk/Dockerfile b/splunk/Dockerfile index b5d2d73..7f1f8c0 100644 --- a/splunk/Dockerfile +++ b/splunk/Dockerfile @@ -1,6 +1,5 @@ ARG SPLUNK_VERSION=latest FROM splunk/splunk:$SPLUNK_VERSION -ARG SPLUNK_APP=TA_UNKNOWN -ARG SOURCE_PACKAGE=package + COPY etc/apps/ /opt/splunk/etc/apps/ \ No newline at end of file diff --git a/tests/conftest.py b/tests/conftest.py index 82a62d2..d79fc73 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -90,7 +90,7 @@ def pytest_addoption(parser): action='store', dest='splunk_version', default='latest', - help='Splunk password' + help='Splunk version' )