diff options
| author | Fabien Catteau <fcatteau@gitlab.com> | 2019-08-20 15:24:23 +0000 |
|---|---|---|
| committer | Fabien Catteau <fcatteau@gitlab.com> | 2019-08-20 15:24:23 +0000 |
| commit | 20a92905943385a1cecb5e30aa321f3e60374dc1 (patch) | |
| tree | 9fda93efa57f84d06f0c65ac22effd179c7572e0 /.gitlab-ci.yml | |
| parent | 19f8fdcd8b2351daf220e3a3a456db84dd661280 (diff) | |
| parent | e0a342905013a0ba21baf4233ae85d2d65a6bd6b (diff) | |
Merge branch 'ee-12032-defaults-to-python-3' into 'master'v1.6.0
Defaults to Python 3.5
See merge request gitlab-org/security-products/license-management!56
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 63 |
1 files changed, 47 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d54da14..1a7d005 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ container_scanning: image: docker:stable stage: test variables: - LM_PYTHON_VERSION: 2 + LM_PYTHON_VERSION: 3 script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -56,13 +56,13 @@ QA:java-maven: QA:python-pip: extends: .QA variables: + LM_PYTHON_VERSION: 2 QA_PROJECT: python-pip QA_REF: 04dce91b QA:python3-pip: extends: .QA variables: - LM_PYTHON_VERSION: 3 QA_RESULTS: python3-pip QA_PROJECT: python-pip QA_REF: 48e250a1 @@ -91,6 +91,20 @@ QA:go: - docker tag $SOURCE_IMAGE $TARGET_IMAGE - docker push $TARGET_IMAGE +.docker_tag_python2: + image: docker:stable + stage: tag + script: + - docker info + - 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 + - echo "FROM $SOURCE_IMAGE" > Dockerfile.python2 + - echo "ENV LM_PYTHON_VERSION 2.7" >> Dockerfile.python2 + - docker build -t $TARGET_IMAGE -f Dockerfile.python2 . + - docker push $TARGET_IMAGE + branch: extends: .docker_tag variables: @@ -118,12 +132,29 @@ version: when: manual allow_failure: false +version python2: + extends: .docker_tag_python2 + before_script: + - export IMAGE_TAG=${CI_COMMIT_TAG/v/}-python2 + - echo "Checking that $CI_COMMIT_TAG is last in the changelog" + - test "$(grep '^## v' CHANGELOG.md |head -n 1)" = "## $CI_COMMIT_TAG" + only: + - tags + when: manual + allow_failure: false + .release: extends: .docker_tag stage: release only: - tags +.release_python2: + extends: .docker_tag_python2 + stage: release + only: + - tags + major: extends: .release variables: @@ -139,43 +170,43 @@ latest: extends: .release 12-1-stable: - extends: .release + extends: .release_python2 12-0-stable: - extends: .release + extends: .release_python2 11-11-stable: - extends: .release + extends: .release_python2 11-10-stable: - extends: .release + extends: .release_python2 11-9-stable: - extends: .release + extends: .release_python2 11-8-stable: - extends: .release + extends: .release_python2 11-7-stable: - extends: .release + extends: .release_python2 11-6-stable: - extends: .release + extends: .release_python2 11-5-stable: - extends: .release + extends: .release_python2 11-4-stable: - extends: .release + extends: .release_python2 11-3-stable: - extends: .release + extends: .release_python2 11-2-stable: - extends: .release + extends: .release_python2 11-1-stable: - extends: .release + extends: .release_python2 11-0-stable: - extends: .release + extends: .release_python2 |