Verified Commit e0638933 authored by Tetiana Chupryna's avatar Tetiana Chupryna
Browse files

Update default name of the generated report

parent 478bd8cb
# GitLab License management changelog
## v3.12.0
- Update default name of the generated report. (!TBA)
## v3.11.2
- Ensure `LM_*_VERSION` variables take precedence over `ASDF_*_VERSION` variables. (!163)
......
......@@ -108,6 +108,7 @@ The License Management tool can be customized with environments variables for so
| LM_JAVA_VERSION | Java (Maven) | Version of Java. If set to `11`, Maven and Gradle use Java 11 instead of Java 8. |
| LM_PYTHON_VERSION | Python | Version of Python. If set to `3`, dependencies are installed using Python 3 instead of Python 2.7. |
| LOG_LEVEL | * | Control the verbosity of the logs. (`debug`, `info`, `warn` (default), `error`, `fatal`) |
| LM_REPORT_FILE | * | Name of the generated report. If not supplied, defaults to `gl-license-scanning-report.json` |
Inject the required environment variables to the docker command using the [`--env` option flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file)
......
......@@ -19,7 +19,7 @@ export LANG=C.UTF-8
export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug}
export LM_JAVA_VERSION=${LM_JAVA_VERSION:-}
export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-}
export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-scanning-report.json'}
export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
export NO_UPDATE_NOTIFIER=true
export PIPENV_VENV_IN_PROJECT=1
......
......@@ -69,7 +69,7 @@ module IntegrationTestHelper
def scan(env: {})
return {} unless execute(env, './bin/docker-test', project_path.to_s)
report_path = project_path.join('gl-license-management-report.json')
report_path = project_path.join('gl-license-scanning-report.json')
return {} unless report_path.exist?
Report.new(report_path.read)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment