Commit 9eb899e9 authored by Pierre SMEYERS's avatar Pierre SMEYERS
Browse files

Merge branch '2-chnage_variable_behaviour' into 'master' 

feat: Change boolean variable behaviour

Closes #2

See merge request to-be-continuous/k6!2
parents 1f7174f4 f3112ac0

README.md

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ It uses the following variables: 
| `K6_IMAGE`          | The Docker image used to run k6                                                                           | `loadimpact/k6:latest` |

| `K6_TESTS_DIR`     | The k6 tests directory                                                                             | `k6`                    |

| `K6_EXTRA_ARGS`     | k6 extra  [command-line](https://k6.io/docs/getting-started/running-k6)                                   | _none_                 |

| `REVIEW_ENABLED` | Set to enable k6 tests on review environments (dynamic environments instantiated on development branches) | _none_ (disabled)      |

| `REVIEW_ENABLED` | Set to `true` to enable k6 tests on review environments (dynamic environments instantiated on development branches) | _none_ (disabled)      |



### Load performance report integration

templates/gitlab-ci-k6.yml

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ stages: 
    fi

  }



  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update k6 "1.0.0"; fi

  if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update k6 "1.0.0"; fi

  unscope_variables

  eval_all_secrets
@@ -295,6 +295,6 @@ k6: 
    # on production and integration branch(es): auto (on_success)

    - if: '$CI_COMMIT_REF_NAME =~ $PROD_REF || $CI_COMMIT_REF_NAME =~ $INTEG_REF'

    # on other branch(es): manual & non-blocking if $REVIEW_ENABLED set

    - if: $REVIEW_ENABLED

    - if: '$REVIEW_ENABLED == "true"'

      when: manual

      allow_failure: true