Skip to content
Snippets Groups Projects
Commit dbcf302e authored by Nandan Sadineni's avatar Nandan Sadineni
Browse files

Update .gitlab-ci.yml

parent 0b1f9a09
Branches
No related merge requests found
Pipeline #208494 passed with stages
in 36 seconds
...@@ -5,8 +5,7 @@ stages: ...@@ -5,8 +5,7 @@ stages:
variables: variables:
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_BEFORE_SHA CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
CONTAINER_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
before_script: before_script:
- docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
...@@ -16,10 +15,6 @@ build-except-master: ...@@ -16,10 +15,6 @@ build-except-master:
script: script:
- docker build -t $CONTAINER_TEST_IMAGE . - docker build -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE - docker push $CONTAINER_TEST_IMAGE
only:
- branches
except:
- master
tags: tags:
- dvlp - dvlp
- infrastructure - infrastructure
...@@ -29,10 +24,6 @@ test: ...@@ -29,10 +24,6 @@ test:
script: script:
- docker pull $CONTAINER_TEST_IMAGE - docker pull $CONTAINER_TEST_IMAGE
- docker run $CONTAINER_TEST_IMAGE /bin/sh - docker run $CONTAINER_TEST_IMAGE /bin/sh
only:
- branches
except:
- master
tags: tags:
- dvlp - dvlp
- infrastructure - infrastructure
...@@ -40,9 +31,9 @@ test: ...@@ -40,9 +31,9 @@ test:
release-image: release-image:
stage: release stage: release
script: script:
- docker pull $CONTAINER_RELEASE_IMAGE - docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_RELEASE_IMAGE $CONTAINER_RELEASE_IMAGE_TAG - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE_TAG - docker push $CONTAINER_RELEASE_IMAGE
only: only:
- master - master
tags: tags:
......
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