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

fix(lint): use correct path for requirements.txt

Browse Source 
!24
This commit is contained in:
Jon Lockwood
2023-05-15 15:15:59 +09:30
parent 67f39d9694
commit a754aa81ed
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -91,7 +91,7 @@ python Dependencies:
yaml_lint Dependencies: yaml_lint Dependencies:
extends: .gemnasium-python-dependency_scanning extends: .gemnasium-python-dependency_scanning
variables: variables:
PIP_REQUIREMENTS_FILE: yaml_lint/requirements.txt PIP_REQUIREMENTS_FILE: lint/requirements.txt
PyLint: PyLint:
@ -103,7 +103,7 @@ PyLint:
gilab-ci.yml Lint (python 3.11): gilab-ci.yml Lint (python 3.11):
variables: variables:
YAML_LINT_PATH: ".gitlab-ci* ./**/*gitlab-ci*" YAML_LINT_PATH: ".gitlab-ci* ./**/*gitlab-ci*"
YAML_LINT_EXTRA_ARGS: "{ extends: yaml_lint/.yamllint.yaml, ignore: [website-template/*] }" YAML_LINT_EXTRA_ARGS: "{ extends: lint/.yamllint.yaml, ignore: [website-template/*] }"
extends: extends:
- .yaml_lint_defaults - .yaml_lint_defaults
image: python:3.11-slim image: python:3.11-slim

2
lint/ansible.gitlab-ci.yaml
View File

@ -14,7 +14,7 @@
- python3 -m venv env - python3 -m venv env
- . env/bin/activate - . env/bin/activate
- pip install --upgrade pip - pip install --upgrade pip
- pip install -r $ROOT_DIR/ansible/requirements.txt - pip install -r $ROOT_DIR/lint/requirements.txt
- mkdir $PYTHON_VERSION - mkdir $PYTHON_VERSION
script: script:
- ansible-lint -q --nocolor --parseable $ANSIBLE_LINT_PATH > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-ansible-lint.log" 1>&1 || ANSIBLE_LINT=$? - ansible-lint -q --nocolor --parseable $ANSIBLE_LINT_PATH > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/$PYTHON_VERSION-ansible-lint.log" 1>&1 || ANSIBLE_LINT=$?

4
lint/yaml.gitlab-ci.yaml
View File

@ -2,7 +2,7 @@
.yaml_lint_defaults: .yaml_lint_defaults:
variables: variables:
YAML_LINT_PATH: "." YAML_LINT_PATH: "."
YAML_LINT_EXTRA_ARGS: "{ extends: $ROOT_DIR/yaml_lint/.yamllint.yaml, ignore: [gitlab-ci/*] }" YAML_LINT_EXTRA_ARGS: "{ extends: $ROOT_DIR/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
@ -15,7 +15,7 @@
- python3 -m venv env - python3 -m venv env
- . env/bin/activate - . env/bin/activate
- pip install --upgrade pip - pip install --upgrade pip
- pip install -r $ROOT_DIR/yaml_lint/requirements.txt - pip install -r $ROOT_DIR/lint/requirements.txt
- mkdir $PYTHON_VERSION - mkdir $PYTHON_VERSION
script: script:
- echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]" - echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]"