From a295ac691f87a195eaf27c92d889d2cb0d9766c8 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 23 Jan 2024 14:11:05 -0800 Subject: [PATCH] Chore: Update the pre-commit deps to latest ERROR! the role 'java-install' was not found in <> The error appears to be in '': line 5, column 7, but may be elsewhere in the file depending on the exact syntax problem. Update role name to match the role path on GHA and Jenkins jobs. Ref: https://github.com/ansible/molecule/issues/1042 Change-Id: I30299ee2670224d3a4e6448ee78aafaff5cc5b1b Signed-off-by: Anil Belur --- .github/workflow/gerrit-verify.yaml | 1 + .pre-commit-config.yaml | 4 ++-- molecule/default/converge.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflow/gerrit-verify.yaml b/.github/workflow/gerrit-verify.yaml index 3b85129..2c90d97 100644 --- a/.github/workflow/gerrit-verify.yaml +++ b/.github/workflow/gerrit-verify.yaml @@ -120,6 +120,7 @@ jobs: pip3 install ansible ansible-lint molecule-plugins[docker] docker - name: Run Molecule tests. run: molecule test + working-directory: ${{env.working-directory}} env: PY_COLORS: "1" ANSIBLE_FORCE_COLOR: "1" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b10b09b..1af1238 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,11 @@ --- repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.5.0 hooks: - id: trailing-whitespace - repo: https://github.com/jorisroovers/gitlint - rev: v0.17.0 + rev: v0.19.1 hooks: - id: gitlint diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 306d03e..1e30adc 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -2,4 +2,4 @@ - name: Converge hosts: all roles: - - role: docker-install + - role: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" -- 2.16.6