From 5bc61dfb303f17f8c5c744c3377152881e57bf1c Mon Sep 17 00:00:00 2001
From: "Auke L. Klazema" <klazema@astron.nl>
Date: Fri, 21 Feb 2020 15:22:10 +0100
Subject: [PATCH] TMSS-143: Pull the right docker images
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a11c23fd096..d09c5e9f0b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,8 +139,10 @@ deploy-tmss-test:
- cd SAS/TMSS
- ssh lofarsys@scu199.control.lofar "docker-compose -f docker-compose-scu199.yml down"
- scp docker-compose-scu199.yml lofarsys@scu199.control.lofar:~/
- - ssh lofarsys@scu199.control.lofar "docker pull ${CI_NEXUS_REGISTRY}/tmss_testprovider:latest"
- - ssh lofarsys@scu199.control.lofar "docker pull ${CI_NEXUS_REGISTRY}/tmss_web:latest"
+ - ssh lofarsys@tmss-ua.control.lofar "docker pull ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA"
+ - ssh lofarsys@tmss-ua.control.lofar "docker pull ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA"
+ - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_testprovider:latest"
+ - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_django:latest"
- ssh lofarsys@scu199.control.lofar "docker-compose -f docker-compose-scu199.yml up -d"
dependencies:
- build_TMSS
--
GitLab