Commit ecced57a authored by semantic-release-bot's avatar semantic-release-bot
Browse files
parent c1247364
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -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/cloud-foundry'
    ref: '1.0.1'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-cf.yml'
```

@@ -351,11 +351,11 @@ With:
include:
  # main template
  - project: 'Orange-OpenSource/tbc/cloud-foundry'
    ref: '1.0.1'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-cf.yml'
  # Vault variant
  - project: 'Orange-OpenSource/tbc/cloud-foundry'
    ref: '1.0.1'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-cf-vault.yml'

variables:
@@ -384,7 +384,7 @@ variables:
```yaml
include:
  - project: 'Orange-OpenSource/tbc/cloud-foundry'
    ref: '1.0.1'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-cf.yml'

# Global variables
@@ -439,7 +439,7 @@ with [variabilized](https://docs.cloudfoundry.org/devguide/deploy-apps/manifest-
```yaml
include:
  - project: 'Orange-OpenSource/tbc/cloud-foundry'
    ref: '1.0.1'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-cf.yml'

# Global variables
+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ variables:
.cf-base:
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "cloudfoundry", "1.0.1" ]
      command: ["--service", "cloudfoundry", "1.1.0" ]
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/vault-secrets-provider:master"
      alias: "vault-secrets-provider"
+2 −2
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ stages:
    fi
  }

  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update cloud-foundry "1.0.1"; fi
  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update cloud-foundry "1.1.0"; fi
  unscope_variables
  eval_all_secrets

@@ -640,7 +640,7 @@ stages:
  image: $CF_CLI_IMAGE
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "cloudfoundry", "1.0.1" ]
      command: ["--service", "cloudfoundry", "1.1.0" ]
  before_script:
    - *cf-scripts
    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"