From 1f8ef78e5e266fa34f64bc807196a91c6614b491 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Wed, 15 Feb 2023 17:47:54 +0100 Subject: [PATCH 1/8] Lint full codebase before merging --- .github/workflows/test_full_stack.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index ede60785..7b7638f3 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -13,8 +13,30 @@ on: - '!doc/**' 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 roles/ + ansible-lint roles/ + molecule_full_stack: runs-on: ubuntu-latest + needs: lint_full env: COLLECTION_NAMESPACE: netways From 77acd555652def30b05ed0ba582a68481738e625 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 10:13:50 +0100 Subject: [PATCH 2/8] Make a full stack test for every pr against main --- .github/workflows/test_roles_pr.yml | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index d8e79612..37fbc235 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -4,13 +4,31 @@ on: pull_request: branches: - main - - 'feature/**' - - 'fix/**' - - '!doc/**' 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_pr: runs-on: ubuntu-latest + needs: lint_full env: COLLECTION_NAMESPACE: netways @@ -22,12 +40,9 @@ jobs: matrix: distro: - ubuntu2204 + - rockylinux8 scenario: - - beats_default - - elasticsearch_default - - kibana_default - - logstash_default - - repos_default + - elasticstack_full release: - 7 - 8 From 3869fb1b6e1132f78dfcc20fbc95b4a9eda3ace7 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 10:15:28 +0100 Subject: [PATCH 3/8] Test merge to full against all supported OS fixes #17 --- .github/workflows/test_full_stack.yml | 31 +++++---------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 7b7638f3..6671ffdb 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -6,34 +6,8 @@ on: - '*' branches: - main - pull_request: - branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' 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 roles/ - ansible-lint roles/ - molecule_full_stack: runs-on: ubuntu-latest needs: lint_full @@ -47,8 +21,13 @@ jobs: max-parallel: 1 matrix: distro: + - ubuntu2004 - ubuntu2204 + - centos7 - rockylinux8 + - rockylinux9 + - debian10 + - debian11 scenario: - elasticstack_default release: From 0510ec02d3b3c95d726aff117a87f25163824798 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 10:17:44 +0100 Subject: [PATCH 4/8] fix lint --- molecule/repos_oss/prepare.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/repos_oss/prepare.yml b/molecule/repos_oss/prepare.yml index 619f7c2c..0f484d55 100644 --- a/molecule/repos_oss/prepare.yml +++ b/molecule/repos_oss/prepare.yml @@ -14,4 +14,4 @@ name: - gpg-agent update_cache: yes - when: ansible_os_family == "Debian" and ansible_distribution == "Ubuntu" \ No newline at end of file + when: ansible_os_family == "Debian" and ansible_distribution == "Ubuntu" From 652ceaf1acacd25dcd51d95da9b8ad0fe7e84d1b Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 10:25:03 +0100 Subject: [PATCH 5/8] Typo --- .github/workflows/test_roles_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 37fbc235..6ee9f1f7 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -42,7 +42,7 @@ jobs: - ubuntu2204 - rockylinux8 scenario: - - elasticstack_full + - elasticstack_default release: - 7 - 8 From 62fcbe99a7aafe869e10698ca95d83ca4a8ed285 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 10:38:13 +0100 Subject: [PATCH 6/8] Rename jobs --- .github/workflows/test_full_stack.yml | 2 +- .github/workflows/test_roles_pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index 6671ffdb..ed515185 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -8,7 +8,7 @@ on: - main jobs: - molecule_full_stack: + molecule_full_stack_every_os: runs-on: ubuntu-latest needs: lint_full diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 6ee9f1f7..16d72912 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -26,7 +26,7 @@ jobs: run: | yamllint . ansible-lint roles/ - molecule_pr: + molecule_full_stack: runs-on: ubuntu-latest needs: lint_full From 73d07fa8a683aa7b70f7551d45951b02e0ff35c9 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 16:43:46 +0100 Subject: [PATCH 7/8] Run mandatory checks on queueing --- .github/workflows/test_full_stack.yml | 23 +++++++++++++++++++++++ .github/workflows/test_roles_pr.yml | 1 + 2 files changed, 24 insertions(+) diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml index ed515185..d31e62fd 100644 --- a/.github/workflows/test_full_stack.yml +++ b/.github/workflows/test_full_stack.yml @@ -6,8 +6,31 @@ on: - '*' branches: - main + merge_group: 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 diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 16d72912..8ef035d5 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + merge_group: jobs: lint_full: From 7b9e0fc10bb8e102a037300374ec7cee3717ba97 Mon Sep 17 00:00:00 2001 From: Thomas Widhalm Date: Thu, 16 Feb 2023 22:23:43 +0100 Subject: [PATCH 8/8] Run mandatory checks with every PR and queue --- .github/workflows/test_roles_pr.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 8ef035d5..71932d3d 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -2,8 +2,6 @@ name: Test Collection Roles on: pull_request: - branches: - - main merge_group: jobs: