From c81fb9581a5bc9cbc1e1e57fa92f997656eb3fc5 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Fri, 19 Jul 2024 17:16:40 +0000 Subject: [PATCH] Fix stack path check (#877) Reviewed-on: https://git.vdb.to/cerc-io/stack-orchestrator/pulls/877 Co-authored-by: David Boreham Co-committed-by: David Boreham --- stack_orchestrator/util.py | 5 ++++- tests/webapp-test/run-webapp-test.sh | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/stack_orchestrator/util.py b/stack_orchestrator/util.py index d2dd0425..fd445600 100644 --- a/stack_orchestrator/util.py +++ b/stack_orchestrator/util.py @@ -197,7 +197,10 @@ def stack_is_external(stack: str): def stack_is_in_deployment(stack: Path): - return stack.joinpath(deployment_file_name).exists() + if isinstance(stack, os.PathLike): + return stack.joinpath(deployment_file_name).exists() + else: + return False def get_yaml(): diff --git a/tests/webapp-test/run-webapp-test.sh b/tests/webapp-test/run-webapp-test.sh index 39b08c3b..6a12d54c 100755 --- a/tests/webapp-test/run-webapp-test.sh +++ b/tests/webapp-test/run-webapp-test.sh @@ -10,8 +10,11 @@ echo "Environment variables:" env # Test basic stack-orchestrator webapp echo "Running stack-orchestrator webapp test" -# Bit of a hack, test the most recent package -TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 ) +if [ "$1" == "from-path" ]; then + TEST_TARGET_SO="laconic-so" +else + TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 ) +fi # Set a non-default repo dir export CERC_REPO_BASE_DIR=~/stack-orchestrator-test/repo-base-dir echo "Testing this package: $TEST_TARGET_SO" @@ -30,14 +33,17 @@ CHECK="SPECIAL_01234567890_TEST_STRING" set +e -CONTAINER_ID=$(docker run -p 3000:80 -d -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG cerc/test-progressive-web-app:local) +app_image_name="cerc/test-progressive-web-app:local" + +CONTAINER_ID=$(docker run -p 3000:80 -d -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG ${app_image_name}) sleep 3 wget --tries 20 --retry-connrefused --waitretry=3 -O test.before -m http://localhost:3000 docker logs $CONTAINER_ID docker remove -f $CONTAINER_ID -CONTAINER_ID=$(docker run -p 3000:80 -e CERC_WEBAPP_DEBUG=$CHECK -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG -d cerc/test-progressive-web-app:local) +echo "Running app container test" +CONTAINER_ID=$(docker run -p 3000:80 -e CERC_WEBAPP_DEBUG=$CHECK -e CERC_SCRIPT_DEBUG=$CERC_SCRIPT_DEBUG -d ${app_image_name}) sleep 3 wget --tries 20 --retry-connrefused --waitretry=3 -O test.after -m http://localhost:3000 @@ -63,4 +69,18 @@ else echo "AFTER: PASSED" fi +echo "Running deployment create test" +# Note: this is not a full test -- all we're testing here is that the deploy-webapp create command doesn't crash +test_deployment_dir=$CERC_REPO_BASE_DIR/test-deployment-dir +fake_k8s_config_file=$CERC_REPO_BASE_DIR/kube-config.yml +touch ${fake_k8s_config_file} + +$TEST_TARGET_SO deploy-webapp create --kube-config ${fake_k8s_config_file} --deployment-dir ${test_deployment_dir} --image ${app_image_name} --url https://my-test-app.example.com +if [ -d ${test_deployment_dir} ]; then + echo "PASSED" +else + echo "FAILED" + exit 1 +fi + exit 0