Commit bfae6010 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: sanitize empty variable test expressions 

rewrite all '$SOME_VAR' test expressions to '($SOME_VAR != null && $SOME_VAR != "")'
parent 25d7e3cf

templates/gitlab-ci-gcloud.yml

+19 −7
Original line number Diff line number Diff line
@@ -563,8 +563,11 @@ gcp-review: 
    # exclude if $CLEANUP_ALL_REVIEW set to 'force'

    - if: '$CLEANUP_ALL_REVIEW == "force"'

      when: never

    # only on non-production, non-integration branches, with $GCP_REVIEW_PROJECT set

    - if: '$GCP_REVIEW_PROJECT && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'

    # exclude if $GCP_REVIEW_PROJECT not set

    - if: '$GCP_REVIEW_PROJECT == null || $GCP_REVIEW_PROJECT == ""'

      when: never

    # only on non-production, non-integration branches

    - if: '$CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'



# cleanup review env (automatically triggered once branches are deleted)

gcp-cleanup-review:
@@ -585,8 +588,11 @@ gcp-cleanup-review: 
    # exclude tags

    - if: $CI_COMMIT_TAG

      when: never

    # only on non-production, non-integration branches, with $GCP_REVIEW_PROJECT set

    - if: '$GCP_REVIEW_PROJECT && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'

    # exclude if $GCP_REVIEW_PROJECT not set

    - if: '$GCP_REVIEW_PROJECT == null || $GCP_REVIEW_PROJECT == ""'

      when: never

    # only on non-production, non-integration branches

    - if: '$CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'

      when: manual

      allow_failure: true
@@ -605,8 +611,11 @@ gcp-integration: 
    name: integration

  resource_group: integration

  rules:

    # only on integration branch(es), with $GCP_INTEG_PROJECT set

    - if: '$GCP_INTEG_PROJECT && $CI_COMMIT_REF_NAME =~ $INTEG_REF'

    # exclude if $GCP_INTEG_PROJECT not set

    - if: '$GCP_INTEG_PROJECT == null || $GCP_INTEG_PROJECT == ""'

      when: never

    # only on integration branch(es)

    - if: '$CI_COMMIT_REF_NAME =~ $INTEG_REF'



# deploy to staging env (only on master branch)

gcp-staging:
@@ -623,8 +632,11 @@ gcp-staging: 
    name: staging

  resource_group: staging

  rules:

    # exclude if $GCP_STAGING_PROJECT not set

    - if: '$GCP_STAGING_PROJECT == null || $GCP_STAGING_PROJECT == ""'

      when: never

    # only on production branch(es), with $GCP_STAGING_PROJECT set

    - if: '$GCP_STAGING_PROJECT && $CI_COMMIT_REF_NAME =~ $PROD_REF'

    - if: '$CI_COMMIT_REF_NAME =~ $PROD_REF'



gcp-production:

  extends: .gcp-deploy