From d523d842d00c60e1c3194d11d4df6e68841e06e0 Mon Sep 17 00:00:00 2001 From: Tuomo Kivinen Date: Fri, 20 Dec 2024 11:25:01 +0200 Subject: [PATCH] fix running docker tests in non-default hds-root folder --- e2e/docker/run.sh | 7 ++----- e2e/docker/update-snapshots.sh | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/e2e/docker/run.sh b/e2e/docker/run.sh index 4da473f4ac..96016d91ac 100755 --- a/e2e/docker/run.sh +++ b/e2e/docker/run.sh @@ -1,13 +1,12 @@ #!/bin/sh HDS_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )" +HDS_DIR_BASENAME="$(basename "$HDS_ROOT_DIR")" PACKAGE=$1 COMPONENT=$2 COMMAND="" -# PACKAGE=${PACKAGE} COMPONENT=${COMPONENT} yarn update-snapshot:react - # if packaga and component are not provided, run all snapshots if [ -z "$PACKAGE" ] && [ -z "$COMPONENT" ]; then COMMAND="yarn start" @@ -23,6 +22,4 @@ if [ -n "$PACKAGE" ] && [ -n "$COMPONENT" ]; then COMMAND="PACKAGE=${PACKAGE} COMPONENT=${COMPONENT} yarn start-component" fi -docker run -v ${HDS_ROOT_DIR}:/helsinki-design-system -it --rm --ipc=host mcr.microsoft.com/playwright:v1.48.2-jammy /bin/bash -c "cd /helsinki-design-system/e2e && ${COMMAND}" - -# --update-snapshots \ No newline at end of file +docker run -v ${HDS_ROOT_DIR}:/${HDS_DIR_BASENAME} -it --rm --ipc=host mcr.microsoft.com/playwright:v1.48.2-jammy /bin/bash -c "cd /${HDS_DIR_BASENAME}/e2e && ${COMMAND}" diff --git a/e2e/docker/update-snapshots.sh b/e2e/docker/update-snapshots.sh index fe57491f4a..e9f9dcb17b 100755 --- a/e2e/docker/update-snapshots.sh +++ b/e2e/docker/update-snapshots.sh @@ -1,13 +1,12 @@ #!/bin/sh HDS_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )" +HDS_DIR_BASENAME="$(basename "$HDS_ROOT_DIR")" PACKAGE=$1 COMPONENT=$2 COMMAND="" -# PACKAGE=${PACKAGE} COMPONENT=${COMPONENT} yarn update-snapshot:react - # if packaga and component are not provided, run all snapshots if [ -z "$PACKAGE" ] && [ -z "$COMPONENT" ]; then COMMAND="yarn update-snapshots" @@ -23,6 +22,4 @@ if [ -n "$PACKAGE" ] && [ -n "$COMPONENT" ]; then COMMAND="PACKAGE=${PACKAGE} COMPONENT=${COMPONENT} yarn update-snapshots-component" fi -docker run -v ${HDS_ROOT_DIR}:/helsinki-design-system -it --rm --ipc=host mcr.microsoft.com/playwright:v1.48.2-jammy /bin/bash -c "cd /helsinki-design-system/e2e && ${COMMAND}" - -# --update-snapshots \ No newline at end of file +docker run -v ${HDS_ROOT_DIR}:/${HDS_DIR_BASENAME} -it --rm --ipc=host mcr.microsoft.com/playwright:v1.48.2-jammy /bin/bash -c "cd /${HDS_DIR_BASENAME}/e2e && ${COMMAND}"