summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-06-14 17:32:51 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-14 17:32:51 +0000
commit34b8231d49c880fc07f63c0b48f916a4f864e9c5 (patch)
tree25ee2f7b9f068ee5f94e099afb1b4bf522c42eb8
parenteccb2373060cb48628e49adf0d9267b128e98b38 (diff)
parente5f628fa32addacc7b66cd3c3053a158a97a3a68 (diff)
downloadgitlab-ce-34b8231d49c880fc07f63c0b48f916a4f864e9c5.tar.gz
Merge branch 'ee-12033-doc-lm-python-version-docs' into 'master'
Document CI variable LM_PYTHON_VERSION See merge request gitlab-org/gitlab-ce!29667
-rw-r--r--doc/user/application_security/license_management/index.md17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/user/application_security/license_management/index.md b/doc/user/application_security/license_management/index.md
index 08af16412c6..7a583016586 100644
--- a/doc/user/application_security/license_management/index.md
+++ b/doc/user/application_security/license_management/index.md
@@ -168,6 +168,23 @@ to explicitly add `-DskipTests` to your options.
If you still need to run tests during `mvn install`, add `-DskipTests=false` to
`MAVEN_CLI_OPTS`.
+### Selecting the version of Python
+
+> [Introduced](https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/36) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0.
+
+License Management uses Python 2.7 and pip 10.0 by default.
+If your project requires Python 3, you can switch to Python 3.5 and pip 19.1
+by setting the `LM_PYTHON_VERSION` environment variable to `3`.
+
+```yaml
+include:
+ template: License-Management.gitlab-ci.yml
+
+license_management:
+ variables:
+ LM_PYTHON_VERSION: 3
+```
+
### Manual job definition for GitLab 11.5 and later
For GitLab 11.5 and GitLab Runner 11.5 and later, the following `license_management`