From 405fdcc65ef1e95cb5997c610266c1422a06802e Mon Sep 17 00:00:00 2001 From: Pierre Smeyers <pierre.smeyers@orange.com> Date: Thu, 10 Jun 2021 16:56:47 +0200 Subject: [PATCH] feat: move group --- .gitlab-ci.yml | 6 +++--- CONTRIBUTE.md | 4 ++-- README.md | 6 +++--- templates/gitlab-ci-docker.yml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba824a3..fd4d853 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 536de2d..5a24023 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 5996908..7a2d967 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ In order to include this template in your project, add the following to your `.g ```yaml include: - - project: 'Orange-OpenSource/tbc/docker' + - project: 'to-be-continuous/docker' ref: '1.1.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -306,7 +306,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - - project: 'Orange-OpenSource/tbc/docker' + - project: 'to-be-continuous/docker' ref: '1.1.0' file: '/templates/gitlab-ci-docker.yml' @@ -324,7 +324,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u ```yaml include: - - project: 'Orange-OpenSource/tbc/docker' + - project: 'to-be-continuous/docker' ref: '1.1.0' file: '/templates/gitlab-ci-docker.yml' diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index c0184f8..a802971 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.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; @@ -341,7 +341,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" 2> /dev/null || curl -s --connect-timeout 5 "$CI_API_V4_URL/projects/Orange-OpenSource%2Ftbc%2F$1/repository/tags?per_page=1" 2> /dev/null || echo "") + tag_json=$(wget -T 5 -q -O - "$CI_API_V4_URL/projects/to-be-continuous%2F$1/repository/tags?per_page=1" 2> /dev/null || curl -s --connect-timeout 5 "$CI_API_V4_URL/projects/to-be-continuous%2F$1/repository/tags?per_page=1" 2> /dev/null || echo "") echo "$tag_json" | sed -rn 's/^.*"name":"([^"]*)".*$/\1/p' } @@ -365,7 +365,7 @@ stages: .docker-base: services: - - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" + - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "docker", "1.1.0"] before_script: - *docker-scripts @@ -394,7 +394,7 @@ stages: _CUSTOM_CA_CERTS: "${CUSTOM_CA_CERTS}" _TRACE: "${TRACE}" services: - - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" + - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "docker", "1.1.0"] - name: $DOCKER_DIND_IMAGE alias: docker -- GitLab