From 962df93f30b2d09d2fcba4ebda52d98064bc7c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Mon, 26 Jun 2023 13:36:50 +0200 Subject: [PATCH 01/10] Add general linting workflow --- .github/workflows/test_linting.yml | 75 ++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/workflows/test_linting.yml diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml new file mode 100644 index 00000000..8098260c --- /dev/null +++ b/.github/workflows/test_linting.yml @@ -0,0 +1,75 @@ +--- +name: Test Linting +on: + workflow_dispatch: + inputs: + logLevel: + description: 'Log level' + required: true + default: 'warning' + type: choice + options: + - info + - warning + - debug + push: + branches: + - 'feature/**' + - 'fix/**' + - '!doc/**' + paths: + - 'roles/**' + - '.github/workflows/test_linting.yml' + - '.config/ansible-lint.yml' + - '.yamllint' + pull_request: + branches: + - 'feature/**' + - 'fix/**' + - '!doc/**' + paths: + - 'roles/**' + - '.github/workflows/test_linting.yml' + - '.config/ansible-lint.yml' + - '.yamllint' + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code (yamllint). + run: | + yamllint . + + - name: Lint Role beats (ansible-lint). + run: | + ansible-lint roles/beats + + - name: Lint Role elasticsearch (ansible-lint). + run: | + ansible-lint roles/elasticsearch + + - name: Lint Role kibana (ansible-lint). + run: | + ansible-lint roles/kibana + + - name: Lint Role logstash (ansible-lint). + run: | + ansible-lint roles/logstash + + - name: Lint Role repos (ansible-lint). + run: | + ansible-lint roles/repos From 0510438656ff8b9f08c08d239d1adb1cbe89c88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Mon, 26 Jun 2023 13:56:49 +0200 Subject: [PATCH 02/10] Remove linting jobs and schedule workflows after general linting workflow --- .github/workflows/test_full_stack.yml | 22 ------------- .github/workflows/test_role_beats.yml | 31 +++---------------- .github/workflows/test_role_elasticsearch.yml | 30 +++--------------- .github/workflows/test_role_kibana.yml | 31 +++---------------- .github/workflows/test_role_logstash.yml | 31 +++---------------- .github/workflows/test_role_repos.yml | 31 +++---------------- 6 files changed, 24 insertions(+), 152 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 29259b4d..d5779164 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -17,30 +17,8 @@ on: jobs: - lint_full: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint . - ansible-lint roles/ - molecule_full_stack_every_os: runs-on: ubuntu-latest - needs: lint_full env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 71e127d8..3139131b 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -1,6 +1,11 @@ --- name: Test Role beats on: + workflow_run: + workflows: + - Test Linting + types: + - completed workflow_dispatch: inputs: logLevel: @@ -21,8 +26,6 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,33 +35,9 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: - lint_beats: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/beats/ - ansible-lint roles/beats/ - molecule_beats: - needs: lint_beats runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index 418ab8f2..176b1234 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -1,6 +1,10 @@ --- name: Test Role elasticsearch on: + workflow_run: + workflows: [Test Linting] + types: + - completed workflow_dispatch: inputs: logLevel: @@ -21,8 +25,6 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,33 +34,9 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: - lint_elasticsearch: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/elasticsearch/ - ansible-lint roles/elasticsearch/ - molecule_elasticsearch: - needs: lint_elasticsearch runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index ff0c7364..38877199 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -1,6 +1,11 @@ --- name: Test Role Kibana on: + workflow_run: + workflows: + - Test Linting + types: + - completed workflow_dispatch: inputs: logLevel: @@ -21,8 +26,6 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,33 +35,9 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: - lint_kibana: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/kibana/ - ansible-lint roles/kibana/ - molecule_kibana: - needs: lint_kibana runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 2dda7341..0aa0a4bc 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -1,6 +1,11 @@ --- name: Test Role Logstash on: + workflow_run: + workflows: + - Test Linting + types: + - completed workflow_dispatch: inputs: logLevel: @@ -21,8 +26,6 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,34 +35,10 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: - lint_logstash: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/logstash/ - ansible-lint roles/logstash/ - molecule_logstash: runs-on: ubuntu-latest - needs: lint_logstash env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index dc40709c..b78acd99 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -1,5 +1,10 @@ name: Test Role repos on: + workflow_run: + workflows: + - Test Linting + types: + - completed workflow_dispatch: inputs: logLevel: @@ -20,8 +25,6 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -31,33 +34,9 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: - lint_repos: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/repos/ - ansible-lint roles/repos/ - molecule_repos: - needs: lint_repos runs-on: ubuntu-latest env: From e2e80bfe7f4b33323da8b557106f664d63f005b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Mon, 26 Jun 2023 15:21:15 +0200 Subject: [PATCH 03/10] Revert "Remove linting jobs and schedule workflows after general linting workflow" This reverts commit 0510438656ff8b9f08c08d239d1adb1cbe89c88b. --- .github/workflows/test_full_stack.yml | 22 +++++++++++++ .github/workflows/test_role_beats.yml | 31 ++++++++++++++++--- .github/workflows/test_role_elasticsearch.yml | 30 +++++++++++++++--- .github/workflows/test_role_kibana.yml | 31 ++++++++++++++++--- .github/workflows/test_role_logstash.yml | 31 ++++++++++++++++--- .github/workflows/test_role_repos.yml | 31 ++++++++++++++++--- 6 files changed, 152 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index d5779164..29259b4d 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -17,8 +17,30 @@ on: jobs: + lint_full: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint . + ansible-lint roles/ + molecule_full_stack_every_os: runs-on: ubuntu-latest + needs: lint_full env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 3139131b..71e127d8 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -1,11 +1,6 @@ --- name: Test Role beats on: - workflow_run: - workflows: - - Test Linting - types: - - completed workflow_dispatch: inputs: logLevel: @@ -26,6 +21,8 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -35,9 +32,33 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: + lint_beats: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint roles/beats/ + ansible-lint roles/beats/ + molecule_beats: + needs: lint_beats runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index 176b1234..418ab8f2 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -1,10 +1,6 @@ --- name: Test Role elasticsearch on: - workflow_run: - workflows: [Test Linting] - types: - - completed workflow_dispatch: inputs: logLevel: @@ -25,6 +21,8 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -34,9 +32,33 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: + lint_elasticsearch: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint roles/elasticsearch/ + ansible-lint roles/elasticsearch/ + molecule_elasticsearch: + needs: lint_elasticsearch runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index 38877199..ff0c7364 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -1,11 +1,6 @@ --- name: Test Role Kibana on: - workflow_run: - workflows: - - Test Linting - types: - - completed workflow_dispatch: inputs: logLevel: @@ -26,6 +21,8 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -35,9 +32,33 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: + lint_kibana: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint roles/kibana/ + ansible-lint roles/kibana/ + molecule_kibana: + needs: lint_kibana runs-on: ubuntu-latest env: diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 0aa0a4bc..2dda7341 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -1,11 +1,6 @@ --- name: Test Role Logstash on: - workflow_run: - workflows: - - Test Linting - types: - - completed workflow_dispatch: inputs: logLevel: @@ -26,6 +21,8 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -35,10 +32,34 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: + lint_logstash: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint roles/logstash/ + ansible-lint roles/logstash/ + molecule_logstash: runs-on: ubuntu-latest + needs: lint_logstash env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index b78acd99..dc40709c 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -1,10 +1,5 @@ name: Test Role repos on: - workflow_run: - workflows: - - Test Linting - types: - - completed workflow_dispatch: inputs: logLevel: @@ -25,6 +20,8 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -34,9 +31,33 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: + lint_repos: + runs-on: ubuntu-latest + steps: + - name: Check out the codebase. + uses: actions/checkout@v3 + + - name: Set up Python 3. + uses: actions/setup-python@v4 + with: + python-version: '3.x' + + - name: Install test dependencies. + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements-test.txt + + - name: Lint code. + run: | + yamllint roles/repos/ + ansible-lint roles/repos/ + molecule_repos: + needs: lint_repos runs-on: ubuntu-latest env: From e8f3ec5c6071fc9ec5177e310ea98788b7e0dfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Mon, 26 Jun 2023 15:32:09 +0200 Subject: [PATCH 04/10] Add 'workflow_call' to condence down the number of steps --- .github/workflows/test_linting.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml index 8098260c..d0fba498 100644 --- a/.github/workflows/test_linting.yml +++ b/.github/workflows/test_linting.yml @@ -12,13 +12,17 @@ on: - info - warning - debug + workflow_call: + inputs: + rolename: + required: true + type: string push: branches: - 'feature/**' - 'fix/**' - '!doc/**' paths: - - 'roles/**' - '.github/workflows/test_linting.yml' - '.config/ansible-lint.yml' - '.yamllint' @@ -28,7 +32,6 @@ on: - 'fix/**' - '!doc/**' paths: - - 'roles/**' - '.github/workflows/test_linting.yml' - '.config/ansible-lint.yml' - '.yamllint' @@ -53,23 +56,13 @@ jobs: - name: Lint code (yamllint). run: | yamllint . + if: ${{ inputs.rolename == '' }} - - name: Lint Role beats (ansible-lint). - run: | - ansible-lint roles/beats - - - name: Lint Role elasticsearch (ansible-lint). - run: | - ansible-lint roles/elasticsearch - - - name: Lint Role kibana (ansible-lint). - run: | - ansible-lint roles/kibana - - - name: Lint Role logstash (ansible-lint). + - name: Lint Role (yamllint). run: | - ansible-lint roles/logstash + ansible-lint roles/${{ inputs.rolename:-'' }} + if: ${{ inputs.rolename != '' }} - - name: Lint Role repos (ansible-lint). + - name: Lint Role (ansible-lint). run: | - ansible-lint roles/repos + ansible-lint roles/${{ inputs.rolename:-'' }} From d6707cbbf3997a080350562075b15b4525cf04ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Mon, 26 Jun 2023 16:10:24 +0200 Subject: [PATCH 05/10] Add call of common linting workflow to role specific workflows --- .github/workflows/test_role_beats.yml | 26 +++---------------- .github/workflows/test_role_elasticsearch.yml | 26 +++---------------- .github/workflows/test_role_kibana.yml | 25 +++--------------- .github/workflows/test_role_logstash.yml | 26 +++---------------- .github/workflows/test_role_repos.yml | 26 +++---------------- .github/workflows/test_roles_pr.yml | 21 +++------------ 6 files changed, 18 insertions(+), 132 deletions(-) diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 71e127d8..a8bd4416 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -21,8 +21,6 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,30 +30,12 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_beats: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/beats/ - ansible-lint roles/beats/ + uses: ./.github/workflows/test_linting.yml + with: + rolename: beats molecule_beats: needs: lint_beats diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index 418ab8f2..606b92e2 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -21,8 +21,6 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,30 +30,12 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_elasticsearch: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/elasticsearch/ - ansible-lint roles/elasticsearch/ + uses: ./.github/workflows/test_linting.yml + with: + rolename: elasticsearch molecule_elasticsearch: needs: lint_elasticsearch diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index ff0c7364..e2399c2b 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -21,8 +21,6 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,30 +30,13 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_kibana: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' + uses: ./.github/workflows/test_linting.yml + with: + rolename: kibana - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/kibana/ - ansible-lint roles/kibana/ molecule_kibana: needs: lint_kibana diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 2dda7341..97073ae2 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -21,8 +21,6 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,30 +30,12 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_logstash: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/logstash/ - ansible-lint roles/logstash/ + uses: ./.github/workflows/test_linting.yml + with: + rolename: logstash molecule_logstash: runs-on: ubuntu-latest diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index dc40709c..ab3441c0 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -20,8 +20,6 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -31,30 +29,12 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_repos: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint roles/repos/ - ansible-lint roles/repos/ + uses: ./.github/workflows/test_linting.yml + with: + rolename: repos molecule_repos: needs: lint_repos diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 1a703f13..65dd31b7 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -13,25 +13,10 @@ on: jobs: lint_full: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' + uses: ./.github/workflows/test_linting.yml + with: + rolename: '' - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint . - ansible-lint roles/ molecule_full_stack: runs-on: ubuntu-latest needs: lint_full From 600560048078a33e07fd064f15e046f7155c080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Tue, 27 Jun 2023 08:35:42 +0200 Subject: [PATCH 06/10] Fix variable default --- .github/workflows/test_linting.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml index d0fba498..cbb0a4ca 100644 --- a/.github/workflows/test_linting.yml +++ b/.github/workflows/test_linting.yml @@ -60,9 +60,9 @@ jobs: - name: Lint Role (yamllint). run: | - ansible-lint roles/${{ inputs.rolename:-'' }} + ansible-lint roles/${{ inputs.rolename }} if: ${{ inputs.rolename != '' }} - name: Lint Role (ansible-lint). run: | - ansible-lint roles/${{ inputs.rolename:-'' }} + ansible-lint roles/${{ inputs.rolename }} From 1542172ea320c675afb405e4d8f65cbcfe5528d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Tue, 27 Jun 2023 09:05:24 +0200 Subject: [PATCH 07/10] Add linting 'workflow_call' to 'test_full_stack' workflow --- .github/workflows/test_full_stack.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 29259b4d..5bbfdd63 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -16,27 +16,10 @@ on: - cron: "0 4 * * *" jobs: - lint_full: - runs-on: ubuntu-latest - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Lint code. - run: | - yamllint . - ansible-lint roles/ + uses: ./.github/workflows/test_linting.yml + with: + rolename: '' molecule_full_stack_every_os: runs-on: ubuntu-latest From 0b28ed133f369d89c56d1811f8344180b119d28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Tue, 27 Jun 2023 09:19:18 +0200 Subject: [PATCH 08/10] Streamline position of 'needs' directive at the top of a job definition --- .github/workflows/test_full_stack.yml | 2 +- .github/workflows/test_role_logstash.yml | 4 ++-- .github/workflows/test_roles_pr.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 5bbfdd63..9991ae30 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -22,8 +22,8 @@ jobs: rolename: '' molecule_full_stack_every_os: - runs-on: ubuntu-latest needs: lint_full + runs-on: ubuntu-latest env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 97073ae2..717c837b 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -38,8 +38,8 @@ jobs: rolename: logstash molecule_logstash: - runs-on: ubuntu-latest needs: lint_logstash + runs-on: ubuntu-latest env: COLLECTION_NAMESPACE: netways @@ -80,8 +80,8 @@ jobs: ELASTIC_RELEASE: ${{ matrix.release }} molecule_logstash_extended: - runs-on: ubuntu-latest needs: molecule_logstash + runs-on: ubuntu-latest env: COLLECTION_NAMESPACE: netways diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 65dd31b7..5b1e553e 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -18,8 +18,8 @@ jobs: rolename: '' molecule_full_stack: - runs-on: ubuntu-latest needs: lint_full + runs-on: ubuntu-latest env: COLLECTION_NAMESPACE: netways From 051247fffd1f42a645f509a0cd96877336191b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Fri, 11 Aug 2023 09:37:11 +0200 Subject: [PATCH 09/10] Manually merged workflows to be in line with main branch --- .github/workflows/test_full_stack.yml | 5 +- .github/workflows/test_plugins.yml | 10 +-- .github/workflows/test_role_beats.yml | 6 +- .github/workflows/test_role_elasticsearch.yml | 4 ++ .github/workflows/test_role_kibana.yml | 6 +- .github/workflows/test_role_logstash.yml | 65 +++++-------------- .github/workflows/test_role_repos.yml | 4 ++ .github/workflows/test_roles_pr.yml | 23 +++++-- 8 files changed, 58 insertions(+), 65 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 9991ae30..ca4b0be3 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -22,8 +22,8 @@ jobs: rolename: '' molecule_full_stack_every_os: - needs: lint_full runs-on: ubuntu-latest + needs: lint_full env: COLLECTION_NAMESPACE: netways @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false - max-parallel: 6 + max-parallel: 4 matrix: distro: - rockylinux8 @@ -40,7 +40,6 @@ jobs: - ubuntu2204 - debian10 - debian11 - - centos7 - centos8 scenario: - elasticstack_default diff --git a/.github/workflows/test_plugins.yml b/.github/workflows/test_plugins.yml index e0a33d32..75de6cc5 100644 --- a/.github/workflows/test_plugins.yml +++ b/.github/workflows/test_plugins.yml @@ -73,7 +73,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.9.14 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9.14 @@ -113,14 +113,14 @@ jobs: fail-fast: false max-parallel: 1 matrix: - python_version: [ 2.7.18, 3.5.10, 3.6.15, 3.7.13, 3.8.16, 3.10.10 ] + python_version: [ 3.5.10, 3.6.15, 3.7.13, 3.8.16, 3.10.10 ] steps: - name: Check out code uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python_version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python_version }} @@ -160,7 +160,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.9.14 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9.14 @@ -200,7 +200,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.9.14 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9.14 diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index a8bd4416..9b140974 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -21,6 +21,8 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -30,6 +32,8 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_beats: @@ -47,7 +51,7 @@ jobs: strategy: fail-fast: false - max-parallel: 1 + max-parallel: 4 matrix: distro: [ubuntu2204] scenario: [beats_default, beats_peculiar] diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index 606b92e2..d3c89817 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -21,6 +21,8 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -30,6 +32,8 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_elasticsearch: diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index e2399c2b..66406773 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -21,6 +21,8 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -30,6 +32,8 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_kibana: @@ -48,7 +52,7 @@ jobs: strategy: fail-fast: false - max-parallel: 1 + max-parallel: 4 matrix: distro: [ubuntu2204] scenario: [kibana_default] diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 717c837b..374520f7 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -21,6 +21,8 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -30,6 +32,8 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_logstash: @@ -37,51 +41,10 @@ jobs: with: rolename: logstash - molecule_logstash: - needs: lint_logstash - runs-on: ubuntu-latest - - env: - COLLECTION_NAMESPACE: netways - COLLECTION_NAME: elasticstack - - strategy: - matrix: - distro: [ubuntu2204] - scenario: [logstash_default] - release: [ 7, 8 ] - - steps: - - name: Check out code - uses: actions/checkout@v3 - - - name: Set up Python 3 - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-test.txt - - - name: Install collection - run: | - mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE - cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME - - - name: Test with molecule - run: | - molecule test -s ${{ matrix.scenario }} - env: - MOLECULE_DISTRO: ${{ matrix.distro }} - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - ELASTIC_RELEASE: ${{ matrix.release }} molecule_logstash_extended: - needs: molecule_logstash runs-on: ubuntu-latest + needs: lint_logstash env: COLLECTION_NAMESPACE: netways @@ -89,23 +52,25 @@ jobs: strategy: fail-fast: false - max-parallel: 1 + max-parallel: 4 matrix: distro: [ubuntu2204] - scenario: [logstash_run_logstash, - logstash_full_stack-oss, - logstash_specific_version, - logstash_pipelines] - release: [ 7, 8 ] + scenario: + - logstash_full_stack-oss + - logstash_specific_version + - logstash_pipelines + release: + - 7 + - 8 steps: - name: Check out code uses: actions/checkout@v3 - - name: Set up Python 3 + - name: Set up Python 3.8 uses: actions/setup-python@v4 with: - python-version: '3.x' + python-version: 3.8 - name: Install dependencies run: | diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index ab3441c0..b2307ba6 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -20,6 +20,8 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' + - '.config/ansible-lint.yml' + - '.yamllint' pull_request: branches: - 'feature/**' @@ -29,6 +31,8 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_repos: diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 5b1e553e..f66e1cfe 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -3,13 +3,26 @@ name: Test Collection Roles on: pull_request: branches: - - 'main' - 'feature/**' - 'fix/**' - '!doc/**' - - merge_group: - types: [checks_requested] + paths: + - 'roles/**' + - '.github/workflows/test_roles_pr.yml' + - 'molecule/elasticstack_default/**' + - '.config/ansible-lint.yml' + - '.yamllint' + push: + branches: + - 'feature/**' + - 'fix/**' + - '!doc/**' + paths: + - 'roles/**' + - '.github/workflows/test_roles_pr.yml' + - 'molecule/elasticstack_default/**' + - '.config/ansible-lint.yml' + - '.yamllint' jobs: lint_full: @@ -18,8 +31,8 @@ jobs: rolename: '' molecule_full_stack: - needs: lint_full runs-on: ubuntu-latest + needs: lint_full env: COLLECTION_NAMESPACE: netways From fd69c081cc83d31803661814b2eb724854e0f9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6hler?= Date: Fri, 11 Aug 2023 12:01:04 +0200 Subject: [PATCH 10/10] Re-delete workflow trigger paths relating to linting rules from role workflows --- .github/workflows/test_role_beats.yml | 4 ---- .github/workflows/test_role_elasticsearch.yml | 4 ---- .github/workflows/test_role_kibana.yml | 4 ---- .github/workflows/test_role_logstash.yml | 4 ---- .github/workflows/test_role_repos.yml | 4 ---- .github/workflows/test_roles_pr.yml | 4 ---- 6 files changed, 24 deletions(-) diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 9b140974..82741d96 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -21,8 +21,6 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,8 +30,6 @@ on: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' - 'molecule/beats_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_beats: diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index d3c89817..606b92e2 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -21,8 +21,6 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,8 +30,6 @@ on: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' - 'molecule/elasticsearch_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_elasticsearch: diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index 66406773..2d75cb63 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -21,8 +21,6 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,8 +30,6 @@ on: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' - 'molecule/kibana_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_kibana: diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 374520f7..e13e8384 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -21,8 +21,6 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -32,8 +30,6 @@ on: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' - 'molecule/logstash_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_logstash: diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index b2307ba6..ab3441c0 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -20,8 +20,6 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' pull_request: branches: - 'feature/**' @@ -31,8 +29,6 @@ on: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' - 'molecule/repos_**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_repos: diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index ae1e1e30..fdac2e43 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -21,8 +21,6 @@ on: - 'roles/**' - '.github/workflows/test_roles_pr.yml' - 'molecule/elasticstack_default/**' - - '.config/ansible-lint.yml' - - '.yamllint' push: branches: - 'feature/**' @@ -32,8 +30,6 @@ on: - 'roles/**' - '.github/workflows/test_roles_pr.yml' - 'molecule/elasticstack_default/**' - - '.config/ansible-lint.yml' - - '.yamllint' jobs: lint_full: