diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1ab691a7d073c7b96fb1291e1c655905a6e82cf..7c111bfcc4713c988d52a98d8894aa7f1d05623c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,11 @@ include: - - project: 'Orange-OpenSource/tbc/tools/gitlab-ci' + - project: 'to-be-continuous/tools/gitlab-ci' ref: 'master' file: '/templates/validation.yml' - - project: 'Orange-OpenSource/tbc/kicker' + - project: 'to-be-continuous/kicker' ref: 'master' file: '/templates/validation.yml' - - project: 'Orange-OpenSource/tbc/bash' + - project: 'to-be-continuous/bash' ref: '1.0.0' file: 'templates/gitlab-ci-bash.yml' diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index 536de2d62f9fc577d2460e88cea7c8b2dd3c6d5d..5a24023bf705aac9821202c2ef30e06071db25e5 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -70,8 +70,8 @@ Git commits in _to be continuous_ shall be: 1. **atomic** (1 commit `=` 1 and only 1 _thing_), 2. **semantic** (using [semantic-release commit message syntax](https://semantic-release.gitbook.io/semantic-release/#commit-message-format)). -You'll find extensive information about Git commit conventions on the [reference documentation website](https://orange-opensource.gitlab.io/tbc/doc/dev/workflow/#git-commit-guidelines). +You'll find extensive information about Git commit conventions on the [reference documentation website](https://to-be-continuous.gitlab.io/doc/dev/workflow/#git-commit-guidelines). ### Coding Guidelines -The extensive _to be continuous_ coding guidelines can be found on the [reference documentation website](https://orange-opensource.gitlab.io/tbc/doc/dev/guidelines/). +The extensive _to be continuous_ coding guidelines can be found on the [reference documentation website](https://to-be-continuous.gitlab.io/doc/dev/guidelines/). diff --git a/README.md b/README.md index 53c99dc6974157620e1bc9cb106dfb5bb0bdb5d0..63871280f0a94f9707723f796c062dee4d4c61db 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - - project: 'Orange-OpenSource/tbc/helm' + - project: 'to-be-continuous/helm' ref: '1.2.1' file: '/templates/gitlab-ci-helm.yml' ``` @@ -239,7 +239,7 @@ This job [packages your chart into an archive](https://helm.sh/docs/helm/helm_pa #### `semantic-release` integration -If you activate the [`semantic-release-info` job from the `semantic-release` template](https://gitlab.com/Orange-OpenSource/tbc/semantic-release/#semantic-release-info-job), the `mvn-release` job will automatically use the generated next version info for both application version (`--app-version`) and chart version (`--version`). +If you activate the [`semantic-release-info` job from the `semantic-release` template](https://gitlab.com/to-be-continuous/semantic-release/#semantic-release-info-job), the `mvn-release` job will automatically use the generated next version info for both application version (`--app-version`) and chart version (`--version`). If no next version info is generated by semantic-release, the package will be created either, but without versionning info. @@ -305,11 +305,11 @@ With: ```yaml include: # main template - - project: 'Orange-OpenSource/tbc/helm' + - project: 'to-be-continuous/helm' ref: '1.2.1' file: '/templates/gitlab-ci-helm.yml' # Vault variant - - project: 'Orange-OpenSource/tbc/helm' + - project: 'to-be-continuous/helm' ref: '1.2.1' file: '/templates/gitlab-ci-helm-vault.yml' diff --git a/templates/gitlab-ci-helm-vault.yml b/templates/gitlab-ci-helm-vault.yml index 70db8ecaf631e4505bd0d3c573c9d197ec3430c5..17f754ab9e53e7f1cafdca5726c6fb5deb0850af 100644 --- a/templates/gitlab-ci-helm-vault.yml +++ b/templates/gitlab-ci-helm-vault.yml @@ -8,7 +8,7 @@ variables: .helm-base: services: - - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" + - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "helm", "1.2.1" ] - - name: "$CI_REGISTRY/orange-opensource/tbc/tools/vault-secrets-provider:master" + - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-helm.yml b/templates/gitlab-ci-helm.yml index b26c8e0153fbcafff72ec8ac526da10ded5b6b36..e142cdc930b2d0e9e8de4cd9c8a8bec3527a95db 100644 --- a/templates/gitlab-ci-helm.yml +++ b/templates/gitlab-ci-helm.yml @@ -1,5 +1,5 @@ # ========================================================================================= -# Copyright (C) 2021 Orange +# Copyright (C) 2021 Orange & contributors # # This program is free software; you can redistribute it and/or modify it under the terms # of the GNU Lesser General Public License as published by the Free Software Foundation; @@ -435,7 +435,7 @@ stages: function get_latest_template_version() { - tag_json=$(wget -T 5 -q -O - "$CI_API_V4_URL/projects/Orange-OpenSource%2Ftbc%2F$1/repository/tags?per_page=1" || echo "") + tag_json=$(wget -T 5 -q -O - "$CI_API_V4_URL/projects/to-be-continuous%2F$1/repository/tags?per_page=1" || echo "") echo "$tag_json" | sed -rn 's/^.*"name":"([^"]*)".*$/\1/p' } @@ -465,7 +465,7 @@ stages: name: $HELM_CLI_IMAGE entrypoint: [""] services: - - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" + - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "helm", "1.2.1" ] before_script: - *helm-scripts