From ad611e1ec6a4bfd3d1d20b2e8b245cf84c3504bf Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Mon, 25 Mar 2024 16:59:44 -0600
Subject: [PATCH] try making shared/ tests runable by service
---
.gitlab-ci.yml | 9 ++++++---
ci/unit-test.template.yml | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83c87311e..b244c0b47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,7 +209,8 @@ unit test workflow:
variables:
SERVICE_NAME: "workflow"
PATH_PREFIX: "services/"
- PATH_PREFIX2: "shared/workspaces/test/"
+ PATH_PREFIX2: "shared/workspaces/workspaces/"
+ TEST_PREFIX2: "shared/workspaces/test/"
extends: .unit-test
unit test capability:
@@ -218,7 +219,8 @@ unit test capability:
variables:
SERVICE_NAME: "capability"
PATH_PREFIX: "services/"
- PATH_PREFIX2: "shared/workspaces/test/"
+ PATH_PREFIX2: "shared/workspaces/workspaces/"
+ TEST_PREFIX2: "shared/workspaces/test/"
extends: .unit-test
unit test notification:
@@ -227,7 +229,8 @@ unit test notification:
variables:
SERVICE_NAME: "notification"
PATH_PREFIX: "services/"
- PATH_PREFIX2: "shared/workspaces/test/"
+ PATH_PREFIX2: "shared/workspaces/workspaces/"
+ TEST_PREFIX2: "shared/workspaces/test/"
extends: .unit-test
diff --git a/ci/unit-test.template.yml b/ci/unit-test.template.yml
index 3490632f6..b1264fb2d 100644
--- a/ci/unit-test.template.yml
+++ b/ci/unit-test.template.yml
@@ -5,7 +5,7 @@
- cd ${PATH_PREFIX}${SERVICE_NAME}
# use the poetry virtual environment and packages
- poetry install --with test
- - $(poetry env info -p)/bin/pytest . ${PATH_PREFIX2}{SERVICE_NAME} --cov=${SERVICE_NAME} --cov-report=
+ - $(poetry env info -p)/bin/pytest . ${TEST_PREFIX2}{SERVICE_NAME} --cov=${SERVICE_NAME} --cov-report=
- mv ./.coverage ${CI_PROJECT_DIR}/.coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
artifacts:
paths:
@@ -21,6 +21,7 @@
IMAGE_TAG: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
changes:
- ${PATH_PREFIX}${SERVICE_NAME}/**/*
+ - ${PATH_PREFIX2}${SERVICE_NAME}/*
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
variables:
IMAGE_TAG: $CI_COMMIT_TAG
--
GitLab