diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 02875557..2c96168b 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - id: matrix - uses: splunk/addonfactory-test-matrix-action@v1 + uses: splunk/addonfactory-test-matrix-action@v2 fossa-scan: continue-on-error: true @@ -132,7 +132,7 @@ jobs: - fossa-scan - compliance-copyrights - test-splunk-unit - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -166,7 +166,7 @@ jobs: needs: - test-splunk-external - test-splunk-matrix - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: diff --git a/Dockerfile.tests b/Dockerfile.tests index f0f11fb2..3aea9250 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -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 diff --git a/Dockerfile.uf b/Dockerfile.uf index c4d16ce7..c976dfb0 100644 --- a/Dockerfile.uf +++ b/Dockerfile.uf @@ -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:9.3.2 ARG SPLUNK_VERSION=8.2.6 ARG SPLUNK_APP_ID=TA_UNKNOWN ARG SPLUNK_APP_PACKAGE=package diff --git a/pyproject.toml b/pyproject.toml index a1871b53..08e6e439 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,24 +33,24 @@ include = ["pytest_splunk_addon/**/*.json", "pytest_splunk_addon/**/*.txt"] [tool.poetry.dependencies] python = "^3.7" -pytest = ">5.4.0,<8" +pytest = ">8.3,<9" splunk-sdk = ">=1.6" requests = "^2.31.0" -jsonschema = "^v4.17.3" +jsonschema = "^4.17.3" pytest-xdist = "^3.5.0" filelock = "^3.0" pytest-ordering = "~0.6" -junitparser = "^2.2.0" +junitparser = "^3.0.0" addonfactory-splunk-conf-parser-lib = "*" defusedxml = "^0.7.1" -Faker = "^18.0.0" -xmltodict = "^0.13.0" -xmlschema = "^2.5.1" +Faker = "^33.0.0" +xmltodict = "^0.14.0" +xmlschema = "^3.0.0" splunksplwrapper = "^1.1.1" urllib3 = "<2" [tool.poetry.group.dev.dependencies] -pytest-cov = "^4" +pytest-cov = "^6.0.0" requests-mock = "^1.8.0" freezegun = "^1.5.1" pytz = "^2024.1"