diff --git a/yaml_lint/.gitlab-ci.yml b/yaml_lint/.gitlab-ci.yml index 7dee21e..1732430 100644 --- a/yaml_lint/.gitlab-ci.yml +++ b/yaml_lint/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: YAML_LINT_PATH: "/*.yml" YAML_LINT_CONFIG: "/yaml_lint/.yamllint.yaml" + YAML_LINT_EXTRA_ARGS: '-d "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }"' stage: validation before_script: - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi @@ -22,7 +23,7 @@ - echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]" - YAML_LINT_CONFIG=$ROOT_DIR$YAML_LINT_CONFIG - echo "[DEBUG] YAML_LINT_CONFIG[$YAML_LINT_CONFIG]" - - yamllint $YAML_LINT_PATH -f parsable -c $ROOT_DIR/yaml_lint/.yamllint.yaml > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" 1>&1 || YAML_LINT=$? + - yamllint $YAML_LINT_PATH -f parsable $YAML_LINT_EXTRA_ARGS > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" 1>&1 || YAML_LINT=$? - cat "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-yaml-lint.log" | ansible-lint-to-junit-xml > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/$PYTHON_VERSION-yaml-lint.junit.xml" - if [ $YAML_LINT > 0 ]; then echo "YAML lint failed with $YAML_LINT"; exit $YAML_LINT; fi after_script: