Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Install dependencies
run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
poetry install
poetry run pytest -v tests/unit

Expand All @@ -95,6 +98,9 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Setup for testing
run: |
mkdir test-results-${{ matrix.splunk.version }}
Expand Down Expand Up @@ -155,9 +161,9 @@ jobs:
submodules: true
- uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: "3.9"
- run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
poetry install
poetry run pytest -v --splunk-version=${{ matrix.splunk.version }} -m docker -m ${{ matrix.test-marker }} tests/e2e

Expand All @@ -175,15 +181,15 @@ jobs:
persist-credentials: false
- uses: actions/setup-python@v5
with:
python-version: "3.7"
python-version: "3.9"
- uses: actions/download-artifact@v4
with:
name: THIRDPARTY
- name: Update Notices
run: cp -f THIRDPARTY NOTICE
- name: Install Poetry
run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
- id: semantic
uses: splunk/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
- run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
pip install mkdocs mkdocs-material mkdocstrings-python
- name: Deploy to GitHub Pages
if: github.ref_name == 'main'
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile.tests
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive ;\
apt-get install -y --no-install-recommends apt-utils ;\
apt-get install -y locales ;\
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8;\
apt-get install -y curl git python-is-python3 python3-distutils python3-pip
apt-get install -y software-properties-common ;\
add-apt-repository ppa:deadsnakes/ppa ;\
apt-get update ;\
apt-get install -y curl git python3.9 python3.9-venv python3.9-distutils ;\
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3.9 get-pip.py ;

ENV LANG en_US.utf8

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ A Dynamic test tool for Splunk Apps and Add-ons.
## Usage

For full usage instructions, please visit the [documentation](https://splunk.github.io/pytest-splunk-addon).

1 change: 1 addition & 0 deletions docker-compose-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ services:
- SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
- SPLUNK_START_ARGS=--accept-license
- TEST_SC4S_ACTIVATE_EXAMPLES=yes
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
volumes:
results:
external: false
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ services:
- SPLUNK_START_ARGS=--accept-license
- SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
- TEST_SC4S_ACTIVATE_EXAMPLES=yes
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com

uf:
build:
Expand All @@ -104,4 +105,4 @@ services:

volumes:
splunk-sc4s-var:
external: false
external: false
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ which allows the user to test [knowledge objects](https://docs.splunk.com/Splexi

## Support

- **Python**: 3.7
- **Python**: 3.9
- **Platforms**: Linux, Windows and MacOS

## Installation
Expand Down
2 changes: 1 addition & 1 deletion docs/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ substitutions:

**4. Getting Couldn't find a version that satisfies the requirement when installing pytest-splunk-addon using pip.**

- Use `pip3 install pytest-splunk-addon` and make sure you are using python 3.7
- Use `pip3 install pytest-splunk-addon` and make sure you are using python 3.9

**5. While executing test cases on Docker, all the test cases abort with the following setup failure:**

Expand Down
8 changes: 1 addition & 7 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
#!/bin/bash
echo args $@
cd /work
curl https://pyenv.run | bash
export PATH="~/.pyenv/bin:$PATH"
eval "$(pyenv init -)"
pyenv install 3.7.8
pyenv local 3.7.8
curl -sSL https://install.python-poetry.org | python - --version 1.5.1
curl -sSL https://install.python-poetry.org | python3.9 - --version 2.1.4
export PATH="/root/.local/bin:$PATH"
source ~/.poetry/env
sleep 15
poetry install
exec poetry run pytest -vv $@
Loading
Loading