splunk · harshilgajera-crest · May 16, 2024 · May 16, 2024 · May 27, 2024 · May 27, 2024
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -112,8 +112,8 @@ jobs:
           export SPLUNK_VERSION=${{ matrix.splunk.version }}
           export SPLUNK_HEC_TOKEN="9b741d03-43e9-4164-908b-e09102327d22"
           echo $SPLUNK_VERSION
-          docker compose -f "docker-compose-ci.yml" build
-          SPLUNK_PASSWORD=Chang3d! docker compose -f docker-compose-ci.yml up --abort-on-container-exit
+          docker compose -f "docker-compose.yml" build
+          SPLUNK_PASSWORD=Chang3d! docker compose -f docker-compose.yml up --abort-on-container-exit
           docker volume ls
       - name: Collect Results
         run: |

diff --git a/Dockerfile.tests b/Dockerfile.tests
@@ -31,7 +31,7 @@ RUN export DEBIAN_FRONTEND=noninteractive ;\
 
 ENV LANG en_US.utf8
 
-COPY pytest-ci.ini /work/pytest.ini
+COPY pytest.ini /work/pytest.ini
 COPY tests /work/tests/
 WORKDIR /work
 

diff --git a/NOTICE b/NOTICE
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,6 +23,15 @@
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 version: "3.7"
 services:
+  test:
+    build:
+      context: .
+      dockerfile: Dockerfile.tests
+    links:
+      - splunk
+      - sc4s
+    volumes:
+      - results:/work/test-results
 
   sc4s:
     image: ghcr.io/splunk/splunk-connect-for-syslog/container2:latest
@@ -101,5 +110,5 @@ services:
       - ${CURRENT_DIR}/uf_files:${CURRENT_DIR}/uf_files
 
 volumes:
-  splunk-sc4s-var:
+  results:
     external: false
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -11,4 +11,4 @@ export PATH="/root/.local/bin:$PATH"
 source ~/.poetry/env
 sleep 15
 poetry install
-exec poetry run pytest -vv $@
+exec poetry run pytest -vv --junitxml=/work/test-results/test.xml $@
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@
 
 [tool.poetry]
 name = "pytest-splunk-addon"
-version = "5.2.6"
+version = "5.3.0-beta.10"
 description = "A Dynamic test tool for Splunk Apps and Add-ons"
 authors = ["Splunk <[email protected]>"]
 license = "APACHE-2.0"

diff --git a/pytest-ci.ini b/pytest-ci.ini
diff --git a/pytest.ini b/pytest.ini
@@ -15,6 +15,6 @@
 #
 [pytest]
 testpaths = tests
-addopts = -v --tb=long -m docker --log-level=INFO 
+addopts = -v --tb=long -m external tests/e2e
 filterwarnings =
     ignore::DeprecationWarning