From 952a627e8e926098e62d04ed66ecd66bef00eb73 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 | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebc3a326b..3621dd4b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -224,7 +224,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:
@@ -233,7 +234,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:
@@ -242,7 +244,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 bc91ddf7d..0885dbc3f 100644
--- a/ci/unit-test.template.yml
+++ b/ci/unit-test.template.yml
@@ -26,6 +26,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