Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: bump repository configuration from template-refs/heads/main #192

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ci: bump repository configuration from template-refs/heads/main #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238e040
ci: common template rollout changes
srv-rr-github-token Nov 17, 2022
b7aeff5
style: pre-commit run --all-files
srv-rr-github-token Nov 17, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/escu-manual-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile-splunk-local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions Dockerfile-uf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading