From 0d0114e6a7d8539314c25afbd84e7e7c8cfc702d Mon Sep 17 00:00:00 2001
From: sivan <sivanduijn@gmail.com>
Date: Fri, 2 Apr 2021 13:22:57 +0200
Subject: [PATCH] added if else to gitlab yml
---
.gitlab-ci.yml | 4 +++-
deployments/svc.yml | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f56043d..e786291 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,8 @@ coverage:
- cp cover.html $CI_COMMIT_BRANCH
- mv $CI_COMMIT_BRANCH/cover.html $CI_COMMIT_BRANCH/index.html
+ - if [[ $CI_COMMIT_BRANCH = "develop" || $CI_COMMIT_BRANCH = "main" ]]; then COVERAGE_PATH=""; else COVERAGE_PATH="features"; fi
+
# install openssh client and add ssh keys
- apt-get install openssh-client curl -y >/dev/null
- mkdir ~/.ssh/
@@ -45,7 +47,7 @@ coverage:
- echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- ssh -fN -L 1234:science-vs260.science.uu.nl:22 sivan@up.science.uu.nl
- - scp -r -o StrictHostKeyChecking=no -P 1234 -i ~/.ssh/id_rsa $CI_COMMIT_BRANCH root@localhost:/datadisk/documentation-coverage/home/backend/$SERVICE_NAME/features
+ - scp -r -o StrictHostKeyChecking=no -P 1234 -i ~/.ssh/id_rsa $CI_COMMIT_BRANCH root@localhost:/datadisk/documentation-coverage/home/backend/$CI_PROJECT_NAME/$COVERAGE_PATH
artifacts:
untracked: false
expire_in: 30 days
diff --git a/deployments/svc.yml b/deployments/svc.yml
index 2008dda..4280c41 100644
--- a/deployments/svc.yml
+++ b/deployments/svc.yml
@@ -6,3 +6,6 @@ metadata:
spec:
selector:
app: query-handler
+ ports:
+ - port: 3000
+ targetPort: 3000
\ No newline at end of file
--
GitLab