diff --git a/README.md b/README.md index 90b7cc0e96828a3bf017a46b1e7fcfc9e6df22c2..9f0bb6413e79750c9ecf5c4de58c072fdbbe5cbf 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/templates/gitlab-ci-openshift-vault.yml b/templates/gitlab-ci-openshift-vault.yml index 426be35986833d2f558430aa3ec042153c69af17..5d6e6af8cad738cce879492b299e59c04e4bee95 100644 --- a/templates/gitlab-ci-openshift-vault.yml +++ b/templates/gitlab-ci-openshift-vault.yml @@ -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" diff --git a/templates/gitlab-ci-openshift.yml b/templates/gitlab-ci-openshift.yml index 48cd318b56accf6ff0e5dc318e095d0c30508bb3..7804146c377fdfb95ccbecc489dc3553590d73a1 100644 --- a/templates/gitlab-ci-openshift.yml +++ b/templates/gitlab-ci-openshift.yml @@ -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}"