Loading capif/.gitlab-ci.yml +2 −3 Original line number Diff line number Diff line Loading @@ -646,7 +646,6 @@ deploy_ocf_main: stage: deploy_ocf_main variables: DOMAIN_PRE_PROD: pre-prod.int IMAGE_TAG_PRE_PROD: $CI_COMMIT_REF_SLUG needs: - main_build_and_push <<: *main_common Loading @@ -664,8 +663,8 @@ deploy_ocf_main: - kubectl cluster-info - yq --version - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_PRE_PROD"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_PRE_PROD"' helm/capif/Chart.yaml - yq e -i '.version = "$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading capif/templates/cd-deploy-ocf.gitlab-ci.yml +4 −6 Original line number Diff line number Diff line Loading @@ -11,8 +11,6 @@ variables: DOMAIN_DEV: developer.int DOMAIN_PROD: prod.int CI_JOB_TOKEN: $CI_JOB_TOKEN IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG VAULT_HOSTNAME: $VAULT_HOSTNAME VAULT_PORT: $VAULT_PORT VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN Loading Loading @@ -70,8 +68,8 @@ deploy_ocf_staging: - yq --version - ls -rtt helm/capif - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_STAGING"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_STAGING"' helm/capif/Chart.yaml - yq e -i '.version = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading Loading @@ -130,8 +128,8 @@ deploy_ocf_dev: - kubectl cluster-info - yq --version - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_DEV"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_DEV"' helm/capif/Chart.yaml - yq e -i '.version = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading Loading
capif/.gitlab-ci.yml +2 −3 Original line number Diff line number Diff line Loading @@ -646,7 +646,6 @@ deploy_ocf_main: stage: deploy_ocf_main variables: DOMAIN_PRE_PROD: pre-prod.int IMAGE_TAG_PRE_PROD: $CI_COMMIT_REF_SLUG needs: - main_build_and_push <<: *main_common Loading @@ -664,8 +663,8 @@ deploy_ocf_main: - kubectl cluster-info - yq --version - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_PRE_PROD"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_PRE_PROD"' helm/capif/Chart.yaml - yq e -i '.version = "$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading
capif/templates/cd-deploy-ocf.gitlab-ci.yml +4 −6 Original line number Diff line number Diff line Loading @@ -11,8 +11,6 @@ variables: DOMAIN_DEV: developer.int DOMAIN_PROD: prod.int CI_JOB_TOKEN: $CI_JOB_TOKEN IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG VAULT_HOSTNAME: $VAULT_HOSTNAME VAULT_PORT: $VAULT_PORT VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN Loading Loading @@ -70,8 +68,8 @@ deploy_ocf_staging: - yq --version - ls -rtt helm/capif - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_STAGING"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_STAGING"' helm/capif/Chart.yaml - yq e -i '.version = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading Loading @@ -130,8 +128,8 @@ deploy_ocf_dev: - kubectl cluster-info - yq --version - cat helm/capif/Chart.yaml - yq e -i '.version = "$IMAGE_TAG_DEV"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$IMAGE_TAG_DEV"' helm/capif/Chart.yaml - yq e -i '.version = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - yq e -i '.appVersion = "$$CI_COMMIT_REF_SLUG"' helm/capif/Chart.yaml - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif Loading