Commit 617edd2d 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 635d8423

templates/gitlab-ci-openshift.yml

+22 −10
Original line number Diff line number Diff line
@@ -812,8 +812,11 @@ os-review: 
    # exclude if $CLEANUP_ALL_REVIEW set to 'force'

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

      when: never

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

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

    # exclude if $OS_REVIEW_PROJECT not set

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

      when: never

    # only on non-production, non-integration branches

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



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

os-cleanup-review:
@@ -835,8 +838,11 @@ os-cleanup-review: 
    # exclude if $CLEANUP_ALL_REVIEW set to 'force'

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

      when: never

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

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

    # exclude if $OS_REVIEW_PROJECT not set

    - if: '$OS_REVIEW_PROJECT == null || $OS_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
@@ -864,8 +870,8 @@ os-cleanup-all-review: 
    - if: '$CLEANUP_ALL_REVIEW == "force"'

      when: always

      allow_failure: true

    # on production: manual

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

    # on production: manual if $CLEANUP_ALL_REVIEW set to 'true'

    - if: '$CLEANUP_ALL_REVIEW == "true" && $CI_COMMIT_REF_NAME =~ $PROD_REF'

      when: manual

      allow_failure: true
@@ -882,8 +888,11 @@ os-integration: 
    name: integration

  resource_group: integration

  rules:

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

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

    # exclude if $OS_INTEG_PROJECT not set

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

      when: never

    # only on integration branch(es)

    - if: '$CI_COMMIT_REF_NAME =~ $INTEG_REF'





# Staging deploys are disabled by default since
@@ -904,8 +913,11 @@ os-staging: 
    name: staging

  resource_group: staging

  rules:

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

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

    # exclude if $OS_STAGING_PROJECT not set

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

      when: never

    # only on production branch(es)

    - if: '$CI_COMMIT_REF_NAME =~ $PROD_REF'



os-production:

  extends: .os-deploy