From c80b57db0654323fb202aa52024d2e1efaf4ec44 Mon Sep 17 00:00:00 2001 From: Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:33:48 +0200 Subject: [PATCH] chore(ci): Update scripts for better handling test cases and debugging - Update .gitlab-ci.yml to use 'jq' in addition to 'bash' for improved functionality. - Modify flags in .util/run_tests.sh --- .gitlab-ci.yml | 4 ++-- .util/run_tests.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f3e140..45f439b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ default: - docker:27-dind before_script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - - apk --no-cache add bash + - apk --no-cache add bash jq stages: - build @@ -29,7 +29,7 @@ test_harness: stage: test script: - echo "Starting tests" - - .util/run_tests.sh -i $CLIENT_CONTAINER_GITSHA_IMAGE --docker -D + - .util/run_tests.sh -i $CLIENT_CONTAINER_GITSHA_IMAGE --docker -d -D build_opengl: stage: build diff --git a/.util/run_tests.sh b/.util/run_tests.sh index a5a61d4..3584e21 100755 --- a/.util/run_tests.sh +++ b/.util/run_tests.sh @@ -100,15 +100,15 @@ parse_params() { eval set -- ${args} while [[ $# -gt 0 ]]; do case $1 in - -f | --failfast) + -f|--failfast) failfast="true" shift ;; - -k | --keep-server) + -k|--keep-server) stop_server="false" shift ;; - -h | --help) + -h|--help) usage shift ;; @@ -120,11 +120,11 @@ parse_params() { docker_cmd="podman" shift ;; - -D | --show-debug) + -D|--show-debug) show_debug="true" shift ;; - -d | --debug) + -d|--debug) debug=true shift ;;