Commit 793c7436 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

refactor: remove deprecated legacy $OS_REVIEW_ENVIRONMENT_SCHEME and... 

refactor: remove deprecated legacy $OS_REVIEW_ENVIRONMENT_SCHEME and $OS_REVIEW_ENVIRONMENT_DOMAIN variables support
parent 3670d4a0

templates/gitlab-ci-openshift.yml

+1 −5
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ variables: 
  OS_BASE_APP_NAME: $[[ inputs.base-app-name ]]

  OS_SCRIPTS_DIR: $[[ inputs.scripts-dir ]]

  OS_BASE_TEMPLATE_NAME: $[[ inputs.base-template-name ]]

  # deprecated, backward compatibility

  OS_REVIEW_ENVIRONMENT_SCHEME: https

  OS_REVIEW_AUTOSTOP_DURATION: $[[ inputs.review-autostop-duration ]]

  OS_CLEANUP_OBJECT_TYPES: all,pvc,configmap,secret
@@ -489,7 +487,7 @@ stages: 
    export project

    export environment_type=$ENV_TYPE

    export environment_name=${ENV_APP_NAME:-${OS_BASE_APP_NAME}${ENV_APP_SUFFIX}}

    environment_url=${ENV_URL:-${OS_ENVIRONMENT_URL:-$ENV_URL_LEGACY}}

    environment_url=${ENV_URL:-$OS_ENVIRONMENT_URL}

    # also export environment_name in SCREAMING_SNAKE_CASE format (may be useful with OpenShift env variables)

    environment_name_ssc=$(to_ssc "$environment_name")

    export environment_name_ssc
@@ -799,8 +797,6 @@ os-review: 
    ENV_TYPE: review

    ENV_APP_NAME: "$OS_REVIEW_APP_NAME"

    ENV_URL: "${OS_REVIEW_ENVIRONMENT_URL}"

    # deprecated, backward compatibility

    ENV_URL_LEGACY: "${OS_REVIEW_ENVIRONMENT_SCHEME}://${CI_PROJECT_NAME}-${CI_ENVIRONMENT_SLUG}.${OS_REVIEW_ENVIRONMENT_DOMAIN}"

    ENV_API_URL: "$OS_REVIEW_URL"

    ENV_TOKEN: "$OS_REVIEW_TOKEN"

    ENV_PROJECT: "$OS_REVIEW_PROJECT"