[arvados] updated: 2.7.0-6364-g9f2e8304ca
git repository hosting
git at public.arvados.org
Mon Apr 8 14:54:44 UTC 2024
Summary of changes:
services/workbench2/Makefile | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
via 9f2e8304caea45f8e7a603a0e4019fd5845f4264 (commit)
from 31f0010ed0833ff91600cd8ce31d4df1847882cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 9f2e8304caea45f8e7a603a0e4019fd5845f4264
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Mar 21 15:55:58 2024 -0400
Don't pass -ti when $ci is defined, no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 1a68d6fd77..72235b96f7 100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -43,6 +43,12 @@ export WORKSPACE?=$(shell pwd)
ARVADOS_DIRECTORY?=$(shell env -C $(WORKSPACE) git rev-parse --show-toplevel)
+ifndef ci
+ TI=-ti
+else
+ TI=
+endif
+
.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
help:
@@ -92,7 +98,7 @@ else
endif
integration-tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -ti --rm \
+ docker run $(TI) --rm \
--env ARVADOS_DIRECTORY=/usr/src/arvados \
--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
@@ -102,7 +108,7 @@ integration-tests-in-docker: workbench2-build-image check-arvados-directory
make arvados-server-install integration-tests SPECFILE=$(SPECFILE)
unit-tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -ti --rm \
+ docker run $(TI) --rm \
--env ARVADOS_DIRECTORY=/usr/src/arvados \
--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
@@ -112,7 +118,7 @@ unit-tests-in-docker: workbench2-build-image check-arvados-directory
make arvados-server-install unit-tests
tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -ti --rm \
+ docker run $(TI) --rm \
--env ARVADOS_DIRECTORY=/usr/src/arvados \
--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
--env ci="${ci}" \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list