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

feat: move group

parent 80da7d26

.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

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


```yaml

include:

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

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

    ref: '1.1.0'

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

```
@@ -457,11 +457,11 @@ With: 
```yaml

include:

  # main template

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

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

    ref: '1.1.0'

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

  # Vault variant

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

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

    ref: '1.1.0'

    file: '/templates/gitlab-ci-openshift-vault.yml'
@@ -487,7 +487,7 @@ variables: 


```yaml

include:

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

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

    ref: '1.1.0' 

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

templates/gitlab-ci-openshift-vault.yml

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


.os-base:

  services:

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

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

      command: ["--service", "openshift", "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-openshift.yml

+4 −4
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;
@@ -14,7 +14,7 @@ 
# Floor, Boston, MA  02110-1301, USA.

# =========================================================================================

variables:

  # Docker Image with OC CLI tool (can be overriden)

  # Docker Image with OC CLI tool (can be overridden)

  OS_CLI_IMAGE: "openshift/origin-cli:latest"



  # [mandatory] OS_URL              : the OpenShift API url
@@ -542,7 +542,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'

  }
@@ -573,7 +573,7 @@ stages: 
.os-base:

  image: $OS_CLI_IMAGE

  services:

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

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

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

  before_script:

    - *os-scripts