Commit c9696d7b authored by rajkumar's avatar rajkumar
Browse files

Updating deploy tasks using rules.

parent fadea931
...@@ -38,12 +38,13 @@ docker-build-test: ...@@ -38,12 +38,13 @@ docker-build-test:
docker-build-prod: docker-build-prod:
stage: package stage: package
# only: only:
- /^(\d+\.)?(\d+\.)?(\*|\d+)$/ && tags && master
# - /^(\d+\.)?(\d+\.)?(\*|\d+)$/ # - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
# variables: # variables:
# - $CI_COMMIT_BRANCH == "master" # - $CI_COMMIT_BRANCH == "master"
rules: #rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_REF_NAME =~ /^(\d+\.)?(\d+\.)?(\*|\d+)$/' # - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_REF_NAME =~ /^(\d+\.)?(\d+\.)?(\*|\d+)$/'
# - if: '$CI_COMMIT_TAG' # - if: '$CI_COMMIT_TAG'
# - if: '$CI_COMMIT_REF_NAME =~ /^(\d+\.)?(\d+\.)?(\*|\d+)$/' # - if: '$CI_COMMIT_REF_NAME =~ /^(\d+\.)?(\d+\.)?(\*|\d+)$/'
...@@ -87,7 +88,7 @@ k8s-deploy-prod: ...@@ -87,7 +88,7 @@ k8s-deploy-prod:
image: dtzar/helm-kubectl image: dtzar/helm-kubectl
stage: deploy stage: deploy
only: only:
- /^(\d+\.)?(\d+\.)?(\*|\d+)$/ - /^(\d+\.)?(\d+\.)?(\*|\d+)$/ && tags && master
except: except:
- triggers - triggers
script: script:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment