infrastructure/gitlab-ci
2
0
Fork 0
Code Issues 17 Pull Requests 1 Actions Projects Releases 21 Wiki Activity

fix(yaml_lint): ensure config is within double quote

Browse Source 
!21
This commit is contained in:
Jon Lockwood
2023-05-14 13:59:13 +09:30
parent 7ed3f92dd7
commit 3b686a461b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -103,7 +103,7 @@ PyLint:
gilab-ci.yml Lint (python 3.6): gilab-ci.yml Lint (python 3.6):
variables: variables:
YAML_LINT_PATH: ".gitlab-ci* ./**/.gitlab-ci*" YAML_LINT_PATH: ".gitlab-ci* ./**/.gitlab-ci*"
YAML_LINT_EXTRA_ARGS: '-d "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [website-template/*] }"' YAML_LINT_EXTRA_ARGS: "{ extends: yaml_lint/.yamllint.yaml, ignore: [website-template/*] }"
extends: extends:
- .yaml_lint_defaults - .yaml_lint_defaults
image: python:3.6-slim image: python:3.6-slim

5
yaml_lint/.gitlab-ci.yml
View File

@ -2,8 +2,7 @@
.yaml_lint_defaults: .yaml_lint_defaults:
variables: variables:
YAML_LINT_PATH: "." YAML_LINT_PATH: "."
YAML_LINT_CONFIG: "/yaml_lint/.yamllint.yaml" YAML_LINT_EXTRA_ARGS: "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }"
YAML_LINT_EXTRA_ARGS: '-d "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }"'
stage: validation stage: validation
before_script: before_script:
- if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi
@ -23,7 +22,7 @@
- echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]" - echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]"
- YAML_LINT_CONFIG=$ROOT_DIR$YAML_LINT_CONFIG - YAML_LINT_CONFIG=$ROOT_DIR$YAML_LINT_CONFIG
- echo "[DEBUG] YAML_LINT_CONFIG[$YAML_LINT_CONFIG]" - echo "[DEBUG] YAML_LINT_CONFIG[$YAML_LINT_CONFIG]"
- 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=$? - yamllint $YAML_LINT_PATH -f parsable -d "$(echo $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" - 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 - if [ $YAML_LINT > 0 ]; then echo "YAML lint failed with $YAML_LINT"; exit $YAML_LINT; fi
after_script: after_script: