Skip to content

Commit 9d0f794

Browse files
committed
print VERSION variables before run in container
1 parent b6ff306 commit 9d0f794

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/workflows/run-bats-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ jobs:
2929
- name: run tests
3030
run: |
3131
for script in ../scripts/test00[1-9]*; do
32-
./docker_container_driver.sh $script
32+
./docker_container_driver.sh -V $script
3333
done

.github/workflows/run-local-suite.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,4 @@ jobs:
2828

2929
- name: run tests
3030
run: |
31-
for script in ../scripts/test000*; do
32-
./docker_container_driver.sh $script
33-
done
31+
./docker_container_driver.sh -V ../scripts/run_suite_locally.sh

irods/test/harness/docker_container_driver.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ RUN_AS_USER=""
55
ECHO_CONTAINER=""
66
REMOVE_OPTION="--rm"
77
EXPLICIT_WORKDIR=""
8+
VERBOSITY=0
89
while [[ $1 = -* ]]; do
10+
if [ "$1" = -V ]; then
11+
VERBOSITY=1
12+
shift
13+
fi
914
if [ "$1" = -c ]; then
1015
ECHO_CONTAINER=1
1116
shift
@@ -99,6 +104,13 @@ while :; do
99104
break
100105
done
101106

107+
if [ $VERBOSITY -gt 0 ]; then
108+
echo $'\n'"==> Running script [$testscript_abspath]"
109+
echo "in container [$CONTAINER]"
110+
echo "with these *_VERSION variables in environment: "
111+
$DOCKER exec $CONTAINER bash -c 'env|grep _VERSION' | sed $'s/^/\t/'
112+
fi
113+
102114
$DOCKER exec ${RUN_AS_USER:+"-u$RUN_AS_USER"} \
103115
${WORKDIR:+"-w$WORKDIR"} \
104116
-e "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" \

0 commit comments

Comments
 (0)