Skip to content
Open
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
52 changes: 26 additions & 26 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ concurrency:

jobs:
meta:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
matrix_supportedSplunk: ${{ steps.matrix.outputs.latestSplunk }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- id: matrix
uses: splunk/addonfactory-test-matrix-action@v3

fossa-scan:
continue-on-error: true
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: run fossa anlyze and create report
run: |
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
Expand All @@ -36,7 +36,7 @@ jobs:
env:
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
- name: upload THIRDPARTY file
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: THIRDPARTY
path: /tmp/THIRDPARTY
Expand All @@ -47,18 +47,18 @@ jobs:
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}

compliance-copyrights:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: apache/skywalking-eyes@v0.6.0
- uses: actions/checkout@v5
- uses: apache/skywalking-eyes@v0.8.0

pre-commit:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
with:
python-version: "3.12"
python-version: "3.14"
- uses: pre-commit/action@v3.0.1

semgrep:
Expand All @@ -67,9 +67,9 @@ jobs:
SEMGREP_KEY: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}

test-splunk-unit:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: true
- name: Install dependencies
Expand All @@ -80,7 +80,7 @@ jobs:


test-splunk-external:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- meta
- pre-commit
Expand All @@ -92,7 +92,7 @@ jobs:
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: true
- name: Setup for testing
Expand All @@ -116,7 +116,7 @@ jobs:
-v pytest-splunk-addon_results:/work/test-results \
registry.access.redhat.com/ubi7/ubi
docker cp dummy:/work/test-results/test.xml test-results-${{ matrix.splunk.version }}
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v5
if: always()
with:
name: splunk ${{ matrix.splunk.version }} external test artifacts
Expand All @@ -131,7 +131,7 @@ jobs:
- fossa-scan
- compliance-copyrights
- test-splunk-unit
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -150,12 +150,12 @@ jobs:
"splunk_cim_model",
]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: true
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: 3.7
python-version: 3.14
- run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
poetry install
Expand All @@ -165,18 +165,18 @@ jobs:
needs:
- test-splunk-external
- test-splunk-matrix
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
# Very Important semantic-release won't trigger a tagged
# build if this is not set false
submodules: false
persist-credentials: false
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: "3.7"
- uses: actions/download-artifact@v4
python-version: "3.14"
- uses: actions/download-artifact@v6
with:
name: THIRDPARTY
- name: Update Notices
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
contents: write
pages: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
with:
python-version: 3.8
python-version: 3.14
- run: |
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
pip install mkdocs mkdocs-material mkdocstrings-python
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tests
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM ubuntu:22.04
FROM ubuntu:24.04

RUN mkdir -p /work/tests
RUN mkdir -p /work/test-results/functional
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.uf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
# TODO: go back to latest version when fixed
ARG SPLUNK_VERSION=8.2.6
FROM splunk/universalforwarder:8.2.6
FROM splunk/universalforwarder:10.0.1
ARG SPLUNK_VERSION=8.2.6
ARG SPLUNK_APP_ID=TA_UNKNOWN
ARG SPLUNK_APP_PACKAGE=package
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ pytest-ordering = "~0.6"
junitparser = "^4.0.0"
addonfactory-splunk-conf-parser-lib = "*"
defusedxml = "^0.7.1"
Faker = "^18.12.0"
xmltodict = "^0.14.0"
xmlschema = "^2.5.1"
Faker = "^37.0.0"
xmltodict = "^1.0.0"
xmlschema = "^4.0.0"
splunksplwrapper = "^1.1.1"
urllib3 = "<2"
certifi = "^2024.7.4"
certifi = "^2025.0.0"
zipp = "^3.6.0"

[tool.poetry.group.dev.dependencies]
pytest-cov = "^4"
pytest-cov = "^7.0.0"
requests-mock = "^1.8.0"
freezegun = "^1.5.1"
pytz = "^2024.1"
Expand Down
Loading