summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-01-16 10:24:11 +0000
committerCan Eldem <celdem@gitlab.com>2020-01-16 10:24:11 +0000
commit2074e7e5ea3012be6f3a72bd4af934a42b7202ca (patch)
treece9ec33580f0e6e3f9cf3df1aab2f2cf7b5601cb /.gitlab-ci.yml
parentf4f59927f87944a4d73be26416a7334521875f40 (diff)
parent34f162a4903d852d47bd5440839f7519eb6fa8f0 (diff)
Merge branch '12012-pipfile-lock' into 'master'v2.4.0
Add support for Pipfile.lock See merge request gitlab-org/security-products/license-management!103
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml21
1 files changed, 21 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02c188c..626153b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,8 @@ size:
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $TMP_IMAGE
+ - docker image ls $TMP_IMAGE
+ - docker image inspect $TMP_IMAGE
unit:
stage: test
@@ -145,6 +147,25 @@ QA:python3-pip-v2:
LM_REPORT_VERSION: 2
QA_RESULTS: python3-pip-v2
+QA:python3-pipenv:
+ extends: .QA
+ variables:
+ QA_RESULTS: python-pipenv-v1
+ QA_PROJECT: python-pipenv
+ QA_REF: pip-file-lock
+
+QA:python3-pipenv-v1-1:
+ extends: QA:python3-pipenv
+ variables:
+ LM_REPORT_VERSION: '1.1'
+ QA_RESULTS: python-pipenv-v1.1
+
+QA:python3-pipenv-v2:
+ extends: QA:python3-pipenv
+ variables:
+ LM_REPORT_VERSION: 2
+ QA_RESULTS: python-pipenv-v2
+
QA:ruby-bundler:
extends: .QA
variables: