Commit b2a0fb3d authored by Pierre SMEYERS's avatar Pierre SMEYERS
Browse files

Merge branch '3-change_variable_behaviour' into 'master' 

feat: Change boolean variable behaviour

Closes #3

See merge request to-be-continuous/robotframework!2
parents f6a57faa 59a90089

README.md

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ It is bound to the `test` stage, and uses the following variable: 


| Name                  | description                              | default value     |

| --------------------- | ---------------------------------------- | ----------------- |

| `ROBOT_LINT_DISABLED` | Disable linter                           | _none_ |

| `ROBOT_LINT_DISABLED` | Set to `true` to disable linter                           | _none_ |



### `robotframework` job
@@ -46,7 +46,7 @@ It is bound to the `acceptance` stage, and uses the following variable: 
| `ROBOT_OPTIONS`       | Robot Framework [additional options](http://robotframework.org/robotframework/latest/RobotFrameworkUserGuide.html#all-command-line-options) | _none_ |

| `PABOT_OPTIONS`       | Pabot [additional options](https://github.com/mkorpela/pabot#command-line-options) (if `ROBOT_THREADS` > `1`)   | _none_ |

| `ACCEPTANCE_ALWAYS`   | Force to execute the test after each commit (even on development branches) | `false` |

| `REVIEW_ENABLED`      | Set to enable Robot Framework tests on review environments (_dynamic environments instantiated on development branches_) | _none_ (disabled) |

| `REVIEW_ENABLED`      | Set to `true` to enable Robot Framework tests on review environments (_dynamic environments instantiated on development branches_) | _none_ (disabled) |



Notes:

templates/gitlab-ci-robotframework.yml

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ stages: 
    fi

  }



  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update robotframework "1.3.0"; fi

  if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update robotframework "1.3.0"; fi

  unscope_variables

  eval_all_secrets
@@ -327,7 +327,7 @@ robotframework-lint: 
    - if: $CI_MERGE_REQUEST_ID

      when: never

    # exclude if $ROBOT_LINT_DISABLED is set

    - if: $ROBOT_LINT_DISABLED

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

      when: never

    # exclude if external test mode

    # /!\ Work around '$ROBOT_PROJECT_IMAGE != "$ROBOT_BASE_IMAGE"' doesn't work
@@ -366,6 +366,6 @@ robotframework: 
    # 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