Commit d54432c4 authored by Jorrit Schaap's avatar Jorrit Schaap

TMSS-163: moved dockerize stage after integration test

parent c2df66a8
stages:
- prepare
- build
- dockerize
- unit_test
- integration_test
- dockerize
- deploy
#
......@@ -106,28 +106,6 @@ build_LTAIngest:
# paths:
# - build/gnucxx11_opt
#
# DOCKERIZE
#
dockerize_TMSS:
stage: dockerize
script:
- cd build/gnucxx11_opt
- ls *
- docker build -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
- cd ../..
- cd SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc
- docker build -t tmss_testprovider:$CI_COMMIT_SHORT_SHA -f dockerfiles/oidc_testprovider .
- docker login -u $CI_NEXUS_REGISTRY_USERNAME -p $CI_NEXUS_REGISTRY_PASSWORD $CI_NEXUS_REGISTRY
- docker tag tmss_django:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_django:$CI_COMMIT_SHORT_SHA
- docker push nexus.cep4.control.lofar:18080/tmss_django:$CI_COMMIT_SHORT_SHA
- docker tag tmss_testprovider:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
- docker push nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
- docker logout $CI_NEXUS_REGISTRY
dependencies:
- build_TMSS
#
# UNIT TEST STAGE
#
......@@ -209,6 +187,31 @@ unit_test_LTAIngest:
# paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
# DOCKERIZE
#
dockerize_TMSS:
stage: dockerize
script:
- cd build/gnucxx11_opt
- ls *
- docker build -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
- cd ../..
- cd SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc
- docker build -t tmss_testprovider:$CI_COMMIT_SHORT_SHA -f dockerfiles/oidc_testprovider .
- docker login -u $CI_NEXUS_REGISTRY_USERNAME -p $CI_NEXUS_REGISTRY_PASSWORD $CI_NEXUS_REGISTRY
- docker tag tmss_django:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_django:$CI_COMMIT_SHORT_SHA
- docker push nexus.cep4.control.lofar:18080/tmss_django:$CI_COMMIT_SHORT_SHA
- docker tag tmss_testprovider:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
- docker push nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
- docker logout $CI_NEXUS_REGISTRY
dependencies:
- integration_test_TMSS
#
# INTEGRATION TEST STAGE
#
......
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