Commit 80da7d26 authored by semantic-release-bot's avatar semantic-release-bot
Browse files
parent c6ce6969
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi
```yaml
include:
  - project: 'Orange-OpenSource/tbc/openshift'
    ref: '1.0.0'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-openshift.yml'
```

@@ -458,11 +458,11 @@ With:
include:
  # main template
  - project: 'Orange-OpenSource/tbc/openshift'
    ref: '1.0.0'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-openshift.yml'
  # Vault variant
  - project: 'Orange-OpenSource/tbc/openshift'
    ref: '1.0.0'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-openshift-vault.yml'

variables:
@@ -488,7 +488,7 @@ variables:
```yaml
include:
  - project: 'Orange-OpenSource/tbc/openshift'
    ref: '1.0.0' 
    ref: '1.1.0' 
    file: '/templates/gitlab-ci-openshift.yml'

variables:
+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ variables:
.os-base:
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "openshift", "1.0.0" ]
      command: ["--service", "openshift", "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
@@ -559,7 +559,7 @@ stages:
    fi
  }

  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.0.0"; fi
  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.1.0"; fi

  # export tool functions (might be used in after_script)
  export -f log_info log_warn log_error assert_defined last_rollout_status force_rollout poll_last_rollout extract_oldest_tags_from_image_stream_definition purge_old_image_tags
@@ -574,7 +574,7 @@ stages:
  image: $OS_CLI_IMAGE
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "openshift", "1.0.0" ]
      command: ["--service", "openshift", "1.1.0" ]
  before_script:
    - *os-scripts
    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"