diff options
| author | mo khan <mo.khan@gmail.com> | 2019-10-21 15:24:55 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2019-10-21 15:24:55 +0000 |
| commit | a6adceebeb1ca109439636f90459263ddc828682 (patch) | |
| tree | 746ffcea87ec81e42bde96bcb6dd1d6b52ae6c21 | |
| parent | 3bbac84b46cf8419fb7a6f0304217ad810a842b2 (diff) | |
| parent | 4c16c21d0dbee59da43479a59415fa126d25b4bf (diff) | |
Merge branch '14727-document-release-process' into 'master'
Add documentation on how to release new versions
See merge request gitlab-org/security-products/license-management!69
| -rw-r--r-- | .gitlab-ci.yml | 25 | ||||
| -rw-r--r-- | README.md | 18 |
2 files changed, 18 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b175ee..d998e7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,20 +195,6 @@ QA:js-v2: fi - 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: @@ -236,17 +222,6 @@ 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 @@ -106,6 +106,24 @@ to the docker command. ## Versioning and release process +1. Create a new entry in the `.gitlab-ci.yml` file for the new version to release. + + ```yaml + 12-x-stable: + extends: .release + variables: + DOTENV: ".env.12-x-stable" + ``` + +2. Create a new `.env.*` that corresponds to the version to release and specify the default configuration. + + ```text + FEATURE_RUBY_REPORT 'true' + LM_PYTHON_VERSION '3.5' + LM_REPORT_VERSION '2.0' + LM_V1_CANONICALIZE 'true' + ``` + Please check the [Release Process documentation](https://gitlab.com/gitlab-org/security-products/release/blob/master/docs/release_process.md). # Contributing |