Commit 4bc4b7cd authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

feat: move group

parent 11253a51

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line 
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'

CONTRIBUTE.md

+2 −2
Original line number Diff line number Diff line
@@ -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/).

README.md

+9 −9
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ In order to include this template in your project, add the following to your `gi 


```yaml

include:

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible.yml'
@@ -234,7 +234,7 @@ Here are its parameters: 
* Review environment enabled,

* **Continuous deployment** to production.



Examples are available in the [sample section](/Orange-OpenSource/tbc/samples?utf8=%E2%9C%93&filter=ansible)

Examples are available in the [sample section](/to-be-continuous/samples?utf8=%E2%9C%93&filter=ansible)



### Deploy and configure your infrastructure components
@@ -242,7 +242,7 @@ The `gitlab-ci` in this example, will show use how to configure the template to 


```yaml

include:

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible.yml'
@@ -320,10 +320,10 @@ In the `.gitlab-ci.yml` add the docker template to build your image: 


```yaml

include:

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible.yml'

  - project: 'Orange-OpenSource/tbc/docker'

  - project: 'to-be-continuous/docker'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-docker.yml'
@@ -356,7 +356,7 @@ stages: 
  - production

```



By default, the docker template will push the image in the Gitlab docker registry. Please visit, the docker template page to get more information on [Docker Template](https://gitlab.com//Orange-OpenSource/tbc/docker)

By default, the docker template will push the image in the Gitlab docker registry. Please visit, the docker template page to get more information on [Docker Template](https://gitlab.com//to-be-continuous/docker)



#### Application repository
@@ -364,7 +364,7 @@ Add this `.gitlab-ci.yml` in the repository of your application project (you wil 


```yaml

include:

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible.yml'
@@ -439,11 +439,11 @@ With: 
```yaml

include:

  # main template

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible.yml'

  # Vault variant

  - project: 'Orange-OpenSource/tbc/ansible'

  - project: 'to-be-continuous/ansible'

    ref: '1.1.0'

    file: '/templates/gitlab-ci-ansible-vault.yml'

templates/gitlab-ci-ansible-vault.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ variables: 


.ansible-base:

  services:

    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"

    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

      command: ["--service", "ansible", "1.1.0" ]

    - 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"

templates/gitlab-ci-ansible.yml

+3 −3
Original line number Diff line number Diff line 
# =========================================================================================

# 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;
@@ -381,7 +381,7 @@ stages: 
  }



  function get_latest_template_version() {

    tag_json=$(ansible localhost -m uri -a "url=$CI_API_V4_URL/projects/Orange-OpenSource%2Ftbc%2F$1/repository/tags?per_page=1 return_content=yes" 2>/dev/null |grep \"content\" |sed -rn 's/^\s*"content": "(.*)",\s*$/\1/p' || echo "")

    tag_json=$(ansible localhost -m uri -a "url=$CI_API_V4_URL/projects/to-be-continuous%2F$1/repository/tags?per_page=1 return_content=yes" 2>/dev/null |grep \"content\" |sed -rn 's/^\s*"content": "(.*)",\s*$/\1/p' || echo "")

    echo "$tag_json" | sed -rn 's/^.*"name.?":.?"([^"\]*).?".*$/\1/p'

  }
@@ -418,7 +418,7 @@ stages: 


.ansible-base:

  services:

    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"

    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

      command: ["--service", "ansible", "1.1.0" ]

  before_script:

    - *ansible-scripts