diff options
| author | mo khan <mkhan@gitlab.com> | 2019-09-12 15:55:59 +0000 |
|---|---|---|
| committer | mo khan <mkhan@gitlab.com> | 2019-09-12 15:55:59 +0000 |
| commit | fa7a0dd6496b119b6f143ef8deba177b16f53d1c (patch) | |
| tree | f3f0738459d180a9ffa91c84c214ac75230774ff /.gitlab-ci.yml | |
| parent | 8865a0bc643fdf4d3b679aff84e4f83ba2617936 (diff) | |
| parent | caa6ce0445aec8618924b41f7700173722e37d85 (diff) | |
Merge branch '13083-ruby-shim' into 'master'
Insert a shim to start generating v1 reports using the license finder Ruby API
See merge request gitlab-org/security-products/license-management!55
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 81 |
1 files changed, 57 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a315b3..740b520 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,13 +35,15 @@ container_scanning: image: docker:stable stage: test variables: + FEATURE_RUBY_REPORT: 'false' LM_PYTHON_VERSION: 3 + LM_REPORT_VERSION: 1 script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $TMP_IMAGE - mkdir results - - docker run --env LM_PYTHON_VERSION --volume `pwd`/results:/results $TMP_IMAGE test $QA_PROJECT ${QA_RESULTS:-$QA_PROJECT} $QA_REF + - ./bin/test artifacts: paths: - results/ @@ -63,7 +65,7 @@ QA:python-pip: QA:python3-pip: extends: .QA variables: - QA_RESULTS: python3-pip + QA_RESULTS: python3-pip-v1 QA_PROJECT: python-pip QA_REF: 48e250a1 @@ -93,8 +95,13 @@ QA:js: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - export SOURCE_IMAGE=$TMP_IMAGE - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - - docker pull $SOURCE_IMAGE - - docker tag $SOURCE_IMAGE $TARGET_IMAGE + - | + if [ -z "$DOTENV" ]; then + docker pull $SOURCE_IMAGE + docker tag $SOURCE_IMAGE $TARGET_IMAGE + else + ./bin/docker-dotenv + fi - docker push $TARGET_IMAGE .docker_tag_python2: @@ -155,12 +162,6 @@ version python2: only: - tags -.release_python2: - extends: .docker_tag_python2 - stage: release - only: - - tags - major: extends: .release variables: @@ -171,48 +172,80 @@ latest: 12-3-stable: extends: .release + variables: + DOTENV: ".env.12-3-stable" 12-2-stable: extends: .release + variables: + DOTENV: ".env.12-2-stable" 12-1-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 12-0-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-11-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-10-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-9-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-8-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-7-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-6-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-5-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-4-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-3-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-2-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-1-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" 11-0-stable: - extends: .release_python2 + extends: .release + variables: + DOTENV: ".env.legacy" |