Commit 47929e83 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'correct-base-url' into 'master' 

feat: change base_url variable to be optional and don't failed the pipeline

See merge request to-be-continuous/bruno!3
parents c236c8b1 befcb596

templates/gitlab-ci-bruno.yml

+6 −2
Original line number Diff line number Diff line
@@ -311,10 +311,14 @@ stages: 
      "$1"

    fi

  }

  

  # retrieve server url to test from upstream artifacts ($environment_url variable or 'environment_url.txt' file)

  function eval_env_url() {

    # shellcheck disable=SC2154

    if [[ -n "$environment_url" ]]

    if [[ "$BRU_BASE_URL" ]]

    then

      log_info "Base url explicitly set: use \\e[33;1m$BRU_BASE_URL\\e[0m"

    elif [[ "$environment_url" ]]

    then

      BRU_BASE_URL="$environment_url"

      export BRU_BASE_URL
@@ -367,7 +371,7 @@ bruno: 
          log_info "Running collection \\e[33;1m./${collection}\\e[0m..."

          namenopunct=$(basename $collection | tr '[:punct:]' '_')

          junit_report="$CI_PROJECT_DIR/reports/bruno-$namenopunct.xunit.xml"

          if ! bru run -r --output "$junit_report" --format junit --env-var "base_url=$BRU_BASE_URL" $cacerts_opt $BRU_EXTRA_ARGS

          if ! bru run -r --output "$junit_report" --format junit $cacerts_opt ${BRU_BASE_URL+--env-var "base_url=$BRU_BASE_URL"} $BRU_EXTRA_ARGS

          then

            log_error "Collection \\e[33;1m./${collection}\\e[0m failed"

            rc=1