From 56bd7ae205ef7148fa9615fafe7274479d54a121 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 4 Feb 2020 21:58:56 -0500 Subject: [PATCH] update --- .github/workflows/test_matrix.yml | 8 ++++++-- tests/docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_matrix.yml b/.github/workflows/test_matrix.yml index 46627ca..6cdda08 100644 --- a/.github/workflows/test_matrix.yml +++ b/.github/workflows/test_matrix.yml @@ -38,6 +38,10 @@ jobs: docker-compose -f tests/docker-compose.yml up -d sleep 80 docker-compose -f tests/docker-compose.yml logs + env: + SPLUNK_PASSWORD: ${{ secrets.SPLUNK_PASSWORD }} + SPLUNK_HEC_TOKEN: ${{ secrets.SPLUNK_HEC_TOKEN }} + SPLUNK_START_ARGS: ${{ secrets.SPLUNK_START_ARGS }} - name: Test with pytest run: | pip install pytest @@ -47,8 +51,8 @@ jobs: --splunk_host=127.0.0.1 \ --splunk_port=8089 \ --splunk_version=${{ matrix.splunk-version }} \ - --splunk_password=${{ secrets.GitHub_PAT }} + --splunk_password=${{ secrets.SPLUNK_PASSWORD }} env: - SPLUNKBASE_PASSWORD: ${{ secrets.SPLUNKBASE_PASSWORD }} + SPLUNK_PASSWORD: ${{ secrets.SPLUNK_PASSWORD }} SPLUNK_HEC_TOKEN: ${{ secrets.SPLUNK_HEC_TOKEN }} SPLUNK_START_ARGS: ${{ secrets.SPLUNK_START_ARGS }} diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index ee6b801..08076a7 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -29,7 +29,7 @@ services: - splunk environment: - SPLUNK_HEC_URL=https://splunk:8088 - - SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94 + - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN} - SC4S_SOURCE_TLS_ENABLE=no - SC4S_DEST_SPLUNK_HEC_TLS_VERIFY=no # - SC4S_LISTEN_DEFAULT_TCP_PORT=514 @@ -56,7 +56,7 @@ services: - "8088:8088" - "8089:8089" environment: - - SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94 - - SPLUNK_PASSWORD=Changed@11 + - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN} + - SPLUNK_PASSWORD=${SPLUNK_PASSWORD} - SPLUNK_START_ARGS=--accept-license