From a754aa81edf1570b4e8e2e7d4a23025c8b99f314 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Mon, 15 May 2023 15:15:59 +0930
Subject: [PATCH] fix(lint): use correct path for requirements.txt

!24
---
 .gitlab-ci.yml              | 4 ++--
 lint/ansible.gitlab-ci.yaml | 2 +-
 lint/yaml.gitlab-ci.yaml    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4407449..70ab9c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,7 +91,7 @@ python Dependencies:
 yaml_lint Dependencies:
   extends: .gemnasium-python-dependency_scanning
   variables:
-    PIP_REQUIREMENTS_FILE: yaml_lint/requirements.txt
+    PIP_REQUIREMENTS_FILE: lint/requirements.txt
 
 
 PyLint:
@@ -103,7 +103,7 @@ PyLint:
 gilab-ci.yml Lint (python 3.11):
   variables:
     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:
     - .yaml_lint_defaults
   image: python:3.11-slim
diff --git a/lint/ansible.gitlab-ci.yaml b/lint/ansible.gitlab-ci.yaml
index 3bcd470..3b6498c 100644
--- a/lint/ansible.gitlab-ci.yaml
+++ b/lint/ansible.gitlab-ci.yaml
@@ -14,7 +14,7 @@
     - python3 -m venv env
     - . env/bin/activate
     - pip install --upgrade pip
-    - pip install -r $ROOT_DIR/ansible/requirements.txt
+    - pip install -r $ROOT_DIR/lint/requirements.txt
     - mkdir $PYTHON_VERSION
   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=$?
diff --git a/lint/yaml.gitlab-ci.yaml b/lint/yaml.gitlab-ci.yaml
index 822c7aa..39acb75 100644
--- a/lint/yaml.gitlab-ci.yaml
+++ b/lint/yaml.gitlab-ci.yaml
@@ -2,7 +2,7 @@
 .yaml_lint_defaults:
     variables:
         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
     before_script:
         - 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
         - . env/bin/activate
         - pip install --upgrade pip
-        - pip install -r $ROOT_DIR/yaml_lint/requirements.txt
+        - pip install -r $ROOT_DIR/lint/requirements.txt
         - mkdir $PYTHON_VERSION
     script:
         - echo "[DEBUG] YAML_LINT_PATH[$YAML_LINT_PATH]"