diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-08-16 19:58:41 -0400 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-08-16 20:00:27 -0400 |
| commit | 38490cc98e97023ec9583025b5214f6943fc7cd1 (patch) | |
| tree | 42cc1708ad039ff5c79fbd1e6e411a068b876cd5 | |
| parent | 9eabc0d6fc268023db13e8dad315f99f4fe1a6da (diff) | |
| download | gitlab-ce-ce-LM-use-python-3.tar.gz | |
Use Python 3 by default for License Managementce-LM-use-python-3
| -rw-r--r-- | changelogs/unreleased/ce-LM-use-python-3.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/ce-LM-use-python-3.yml b/changelogs/unreleased/ce-LM-use-python-3.yml new file mode 100644 index 00000000000..40450ecd08d --- /dev/null +++ b/changelogs/unreleased/ce-LM-use-python-3.yml @@ -0,0 +1,5 @@ +--- +title: Use Python 3 by default for License Management +merge_request: 31924 +author: +type: changed diff --git a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml index b6555e627a1..2900f4230c3 100644 --- a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml @@ -10,6 +10,7 @@ license_management: entrypoint: [""] variables: SETUP_CMD: $LICENSE_MANAGEMENT_SETUP_CMD + LM_PYTHON_VERSION: 3 # Default to Python 3 starting with GitLab 12.2. https://about.gitlab.com/2019/07/19/python-3-defailt-for-license-compliance/ allow_failure: true script: - /run.sh analyze . |