diff --git a/.appsec-tests/template_config2.yaml b/.appsec-tests/template_config2.yaml new file mode 100644 index 00000000000..a7f8fab97e6 --- /dev/null +++ b/.appsec-tests/template_config2.yaml @@ -0,0 +1,24 @@ +common: + daemonize: false + log_media: file + log_dir: ${TESTDIR}/runtime/log/ +config_paths: + config_dir: ${TESTDIR}/runtime/ + data_dir: ${DATADIR} + simulation_path: ${TESTDIR}/runtime/simulation.yaml + hub_dir: ${TESTDIR}/runtime/hub/ + index_path: ${TESTDIR}/runtime/hub/.index.json + notification_dir: ${TESTDIR}/runtime/notifications/ + plugin_dir: /usr/local/lib/crowdsec/plugins/ +crowdsec_service: + parser_routines: 1 + acquisition_path: ${TESTDIR}/runtime/acquis.yaml +db_config: + type: sqlite + db_path: ${TESTDIR}/runtime/data/crowdsec.db +api: + client: + credentials_path: ${TESTDIR}/runtime/local_api_credentials.yaml + server: + listen_socket: ${TESTDIR}/runtime/crowdsec.sock + profiles_path: ${TESTDIR}/runtime/profiles.yaml diff --git a/.github/workflows/test_configurations.yaml b/.github/workflows/test_configurations.yaml index 77bed1ccdbb..a9e0041b05f 100644 --- a/.github/workflows/test_configurations.yaml +++ b/.github/workflows/test_configurations.yaml @@ -43,7 +43,7 @@ jobs: run-hub-tests: runs-on: ubuntu-latest container: - image: ghcr.io/crowdsecurity/crowdsec + image: ghcr.io/crowdsecurity/crowdsec:dev options: "--entrypoint bash" env: DISABLE_LOCAL_API: "true" @@ -52,7 +52,7 @@ jobs: steps: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: run tests on last crowdsec tag + - name: run tests with crowdsec from master branch run: | mkdir -p /etc/crowdsec && cp -r /staging/etc/* /etc/ cscli hubtest run --all --clean diff --git a/.gitignore b/.gitignore index dfe332ec0b6..15ddbc80e22 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,8 @@ taxonomy/scenario_taxonomy_errors.md workspace.code-workspace +.cache waf-check/dataset/* waf-check/output/* -waf-check/waf-check \ No newline at end of file +waf-check/waf-check diff --git a/.tests/template_config2.yaml b/.tests/template_config2.yaml new file mode 100644 index 00000000000..9e582f653d5 --- /dev/null +++ b/.tests/template_config2.yaml @@ -0,0 +1,23 @@ +common: + daemonize: false + log_media: file + log_dir: ${TESTDIR}/runtime/log/ +config_paths: + config_dir: ${TESTDIR}/runtime/ + data_dir: ${DATADIR} + simulation_path: ${TESTDIR}/runtime/simulation.yaml + hub_dir: ${TESTDIR}/runtime/hub/ + index_path: ${TESTDIR}/runtime/hub/.index.json + notification_dir: ${TESTDIR}/runtime/notifications/ + plugin_dir: /usr/local/lib/crowdsec/plugins/ +crowdsec_service: + parser_routines: 1 +db_config: + type: sqlite + db_path: ${TESTDIR}/runtime/data/crowdsec.db +api: + client: + credentials_path: ${TESTDIR}/runtime/local_api_credentials.yaml + server: + listen_socket: ${TESTDIR}/runtime/crowdsec.sock + profiles_path: ${TESTDIR}/runtime/profiles.yaml