Loading README.md +4 −4 Original line number Diff line number Diff line Loading @@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' ``` Loading Loading @@ -458,11 +458,11 @@ With: include: # main template - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' # Vault variant - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift-vault.yml' variables: Loading @@ -488,7 +488,7 @@ variables: ```yaml include: - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' variables: Loading templates/gitlab-ci-openshift-vault.yml +1 −1 Original line number Diff line number Diff line Loading @@ -9,6 +9,6 @@ variables: .os-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "openshift", "1.1.0" ] command: ["--service", "openshift", "1.2.0" ] - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider" templates/gitlab-ci-openshift.yml +2 −2 Original line number Diff line number Diff line Loading @@ -559,7 +559,7 @@ stages: fi } if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.1.0"; fi if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.2.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 Loading @@ -574,7 +574,7 @@ stages: image: $OS_CLI_IMAGE services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "openshift", "1.1.0" ] command: ["--service", "openshift", "1.2.0" ] before_script: - *os-scripts - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}" Loading Loading
README.md +4 −4 Original line number Diff line number Diff line Loading @@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' ``` Loading Loading @@ -458,11 +458,11 @@ With: include: # main template - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' # Vault variant - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift-vault.yml' variables: Loading @@ -488,7 +488,7 @@ variables: ```yaml include: - project: 'to-be-continuous/openshift' ref: '1.1.0' ref: '1.2.0' file: '/templates/gitlab-ci-openshift.yml' variables: Loading
templates/gitlab-ci-openshift-vault.yml +1 −1 Original line number Diff line number Diff line Loading @@ -9,6 +9,6 @@ variables: .os-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "openshift", "1.1.0" ] command: ["--service", "openshift", "1.2.0" ] - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider"
templates/gitlab-ci-openshift.yml +2 −2 Original line number Diff line number Diff line Loading @@ -559,7 +559,7 @@ stages: fi } if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.1.0"; fi if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update openshift "1.2.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 Loading @@ -574,7 +574,7 @@ stages: image: $OS_CLI_IMAGE services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" command: ["--service", "openshift", "1.1.0" ] command: ["--service", "openshift", "1.2.0" ] before_script: - *os-scripts - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}" Loading