Skip to content
Snippets Groups Projects
Commit 80da7d26 authored by semantic-release-bot's avatar semantic-release-bot
Browse files
parent c6ce6969
No related branches found
Tags 1.1.0
No related merge requests found
Pipeline #104061 skipped
...@@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi ...@@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi
```yaml ```yaml
include: include:
- project: 'Orange-OpenSource/tbc/openshift' - project: 'Orange-OpenSource/tbc/openshift'
ref: '1.0.0' ref: '1.1.0'
file: '/templates/gitlab-ci-openshift.yml' file: '/templates/gitlab-ci-openshift.yml'
``` ```
...@@ -458,11 +458,11 @@ With: ...@@ -458,11 +458,11 @@ With:
include: include:
# main template # main template
- project: 'Orange-OpenSource/tbc/openshift' - project: 'Orange-OpenSource/tbc/openshift'
ref: '1.0.0' ref: '1.1.0'
file: '/templates/gitlab-ci-openshift.yml' file: '/templates/gitlab-ci-openshift.yml'
# Vault variant # Vault variant
- project: 'Orange-OpenSource/tbc/openshift' - project: 'Orange-OpenSource/tbc/openshift'
ref: '1.0.0' ref: '1.1.0'
file: '/templates/gitlab-ci-openshift-vault.yml' file: '/templates/gitlab-ci-openshift-vault.yml'
variables: variables:
...@@ -488,7 +488,7 @@ variables: ...@@ -488,7 +488,7 @@ variables:
```yaml ```yaml
include: include:
- project: 'Orange-OpenSource/tbc/openshift' - project: 'Orange-OpenSource/tbc/openshift'
ref: '1.0.0' ref: '1.1.0'
file: '/templates/gitlab-ci-openshift.yml' file: '/templates/gitlab-ci-openshift.yml'
variables: variables:
......
...@@ -9,6 +9,6 @@ variables: ...@@ -9,6 +9,6 @@ variables:
.os-base: .os-base:
services: services:
- name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" - 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" - name: "$CI_REGISTRY/orange-opensource/tbc/tools/vault-secrets-provider:master"
alias: "vault-secrets-provider" alias: "vault-secrets-provider"
...@@ -559,7 +559,7 @@ stages: ...@@ -559,7 +559,7 @@ stages:
fi 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 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 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: ...@@ -574,7 +574,7 @@ stages:
image: $OS_CLI_IMAGE image: $OS_CLI_IMAGE
services: services:
- name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master" - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
command: ["--service", "openshift", "1.0.0" ] command: ["--service", "openshift", "1.1.0" ]
before_script: before_script:
- *os-scripts - *os-scripts
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}" - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment