ci: common template rollout changes

splunk · Nov 17, 2022 · 238e040 · 238e040
1 parent 2f36be5
commit 238e040
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 499 deletions.
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: splunk/addonfactory-workflow-addon-release/.github/workflows/reusable-build-test-release.yml@v2.1
+    uses: splunk/addonfactory-workflow-addon-release/.github/workflows/reusable-build-test-release.yml@v2.2
     secrets:
       GH_TOKEN_ADMIN: ${{ secrets.GH_TOKEN_ADMIN }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/escu-manual-workflow.yml b/.github/workflows/escu-manual-workflow.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   call-workflow:
-    uses: splunk/addonfactory-workflow-addon-release/.github/workflows/reusable-escu-manual-workflow.yml@v2.1
+    uses: splunk/addonfactory-workflow-escu-test/.github/workflows/reusable-escu-manual-workflow.yml@v1.0
     with:
       TA_BUILD: ${{ inputs.TA_BUILD }}
       TESTS: ${{ inputs.TESTS }}

diff --git a/.gitignore b/.gitignore
@@ -46,10 +46,15 @@ tests/functional
 .env
 src
 *_event
+*_events
+events.pickle
 *_wait
 !deps/build
 !package/appserver/static/js/build
 *.log
+!tests/**/*.log
+trace.*
+*_events.lock
 
 # ucc ui extensions
 yarn-error.log

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
       - id: end-of-file-fixer
         exclude: ^(tests/requirement_test/logs|tests/knowledge/samples|tests/escu/.escu_detections)
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.8.0
     hooks:
       - id: black
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
@@ -27,4 +27,4 @@ repos:
       - id: eslint
         additional_dependencies:
           - "@typescript-eslint/parser"
-          - "@typescript-eslint/eslint-plugin"
+          - "@typescript-eslint/eslint-plugin"
diff --git a/Dockerfile-splunk-local b/Dockerfile-splunk-local
@@ -5,10 +5,7 @@ ARG SPLUNK_APP_PACKAGE=$SPLUNK_APP_PACKAGE
 RUN echo Splunk VERSION=$SPLUNK_VERSION
 
 COPY deps/apps /opt/splunk/etc/apps/
-COPY deps/build/addonfactory_test_matrix_splunk/packages/all/common /opt/splunk/etc/apps/
-COPY deps/build/addonfactory_test_matrix_splunk/packages/all/sh /opt/splunk/etc/apps/
-COPY deps/build/addonfactory_test_matrix_splunk/packages/all/addon_factory_web /opt/splunk/etc/system/local
 COPY $SPLUNK_APP_PACKAGE /opt/splunk/etc/apps/$SPLUNK_APP_ID
 
 COPY .pytest.expect /home/circleci/work_backend/.pytest.expect
-COPY tests /home/circleci/work_backend/tests
+COPY tests /home/circleci/work_backend/tests
diff --git a/Dockerfile-uf b/Dockerfile-uf
@@ -1,6 +1,7 @@
-ARG SPLUNK_VERSION=latest
-FROM splunk/universalforwarder:$SPLUNK_VERSION
-ARG SPLUNK_VERSION=latest
+# hardcoded SPLUNK_VERSION due to connection issues in versions > 9.0.0
+ARG SPLUNK_VERSION=8.2.6
+FROM splunk/universalforwarder:8.2.6
+ARG SPLUNK_VERSION=8.2.6
 ARG SPLUNK_APP_ID=TA_UNKNOWN
 ARG SPLUNK_APP_PACKAGE=$SPLUNK_APP_PACKAGE
 RUN echo Splunk VERSION=$SPLUNK_VERSION

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -41,7 +41,7 @@ services:
       - results:/home/circleci/work
 
   sc4s:
-    image: splunk/scs:${SC4S_VERSION}
+    image: ghcr.io/splunk/splunk-connect-for-syslog/container2:${SC4S_VERSION}
     hostname: sc4s
     #When this is enabled test_common will fail
     #    command: -det

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -42,7 +42,7 @@ services:
       - results:/home/circleci/work
 
   sc4s:
-    image: splunk/scs:${SC4S_VERSION}
+    image: ghcr.io/splunk/splunk-connect-for-syslog/container2:${SC4S_VERSION}
     hostname: sc4s
     #When this is enabled test_common will fail
     #    command: -det