From 337a477da33d35f3015a17f9bc1605decd6778f6 Mon Sep 17 00:00:00 2001 From: MozeBaltyk Date: Mon, 15 Jan 2024 19:49:40 +0100 Subject: [PATCH] correct workflow and lint --- .github/old/lint.yml | 23 -------------- .github/old/version.yml | 32 -------------------- .github/workflows/build.yml | 6 ++++ .github/workflows/release.yml | 2 +- roles/build_airgap_package/tests/test.yml | 2 +- roles/deploy_certmanager/tests/test.yml | 2 +- roles/deploy_certmanager/vars/main.yml | 2 -- roles/install_rke2_common/tests/test.yml | 2 +- roles/install_rke2_controller/tests/test.yml | 2 +- roles/install_utils_registry/tests/test.yml | 2 +- roles/install_utils_registry/vars/main.yml | 2 -- roles/set_firewalld/tests/test.yml | 2 +- roles/set_nfs_export/tests/test.yml | 2 +- roles/set_nfs_export/vars/main.yml | 2 -- roles/set_nfs_mount/tests/test.yml | 2 +- 15 files changed, 15 insertions(+), 70 deletions(-) delete mode 100644 .github/old/lint.yml delete mode 100644 .github/old/version.yml delete mode 100644 roles/deploy_certmanager/vars/main.yml delete mode 100644 roles/install_utils_registry/vars/main.yml delete mode 100644 roles/set_nfs_export/vars/main.yml diff --git a/.github/old/lint.yml b/.github/old/lint.yml deleted file mode 100644 index 70c71229a..000000000 --- a/.github/old/lint.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Lint -on: - workflow_dispatch: - - pull_request: - branches: ["main"] - -jobs: - build: - name: Ansible Lint # Naming the build is important to use it as a status check - runs-on: ubuntu-latest - steps: - - name: Which branch? - shell: bash - run: | - echo "${{ github.head_ref || github.ref_name }}" - - - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref || github.ref_name }} - - - name: Run ansible-lint - uses: ansible/ansible-lint@main \ No newline at end of file diff --git a/.github/old/version.yml b/.github/old/version.yml deleted file mode 100644 index d22eadae1..000000000 --- a/.github/old/version.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Update README -on: - workflow_dispatch: - #push: - # branches: ["develop"] - pull_request: - branches: ["main"] - -jobs: - version: - runs-on: ubuntu-latest - name: Update Versions - - if: github.repository == 'mozebaltyk/rkub' - permissions: - actions: write - checks: write - contents: write - - steps: - # Checkout on branch where pull request - - name: Which branch? - shell: bash - run: | - echo "${{ github.head_ref || github.ref_name }}" - - - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref || github.ref_name }} - - - name: Update Readme and changelog - uses: ./.github/actions/update-readme diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 798a8969a..a74d96a5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,12 @@ jobs: ref: ${{ github.head_ref || github.ref_name }} # step to install prerequis + - name: Install prerequis + shell: bash + run: | + pwd + ls + make prerequis - name: Run ansible-lint uses: ansible/ansible-lint@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 716454881..65180e20e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release on Ansible Galaxy +name: Release to Ansible Galaxy on: workflow_dispatch: # Not needed anymore, since branch protection diff --git a/roles/build_airgap_package/tests/test.yml b/roles/build_airgap_package/tests/test.yml index 38b2e13ba..cb82eba7d 100644 --- a/roles/build_airgap_package/tests/test.yml +++ b/roles/build_airgap_package/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - build_airgap + - build_airgap_package diff --git a/roles/deploy_certmanager/tests/test.yml b/roles/deploy_certmanager/tests/test.yml index d377fd3e2..7b5bbb231 100644 --- a/roles/deploy_certmanager/tests/test.yml +++ b/roles/deploy_certmanager/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - deploy_cert + - deploy_certmanager diff --git a/roles/deploy_certmanager/vars/main.yml b/roles/deploy_certmanager/vars/main.yml deleted file mode 100644 index 46e8b38e6..000000000 --- a/roles/deploy_certmanager/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for deploy_cert diff --git a/roles/install_rke2_common/tests/test.yml b/roles/install_rke2_common/tests/test.yml index 8844a1bff..f9e168282 100644 --- a/roles/install_rke2_common/tests/test.yml +++ b/roles/install_rke2_common/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - install_common + - install_rke2_common diff --git a/roles/install_rke2_controller/tests/test.yml b/roles/install_rke2_controller/tests/test.yml index d63602c6b..e56cbb71f 100644 --- a/roles/install_rke2_controller/tests/test.yml +++ b/roles/install_rke2_controller/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - install_controler + - install_rke2_controler diff --git a/roles/install_utils_registry/tests/test.yml b/roles/install_utils_registry/tests/test.yml index 50b7e1bef..ad3231ebe 100644 --- a/roles/install_utils_registry/tests/test.yml +++ b/roles/install_utils_registry/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - install_local_registry + - install_utils_registry diff --git a/roles/install_utils_registry/vars/main.yml b/roles/install_utils_registry/vars/main.yml deleted file mode 100644 index a9d100751..000000000 --- a/roles/install_utils_registry/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for install_local_registry diff --git a/roles/set_firewalld/tests/test.yml b/roles/set_firewalld/tests/test.yml index 67768aa7d..1ac4cbf2e 100644 --- a/roles/set_firewalld/tests/test.yml +++ b/roles/set_firewalld/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - firewalld \ No newline at end of file + - set_firewalld \ No newline at end of file diff --git a/roles/set_nfs_export/tests/test.yml b/roles/set_nfs_export/tests/test.yml index 1cde05bbc..63fff5b4c 100644 --- a/roles/set_nfs_export/tests/test.yml +++ b/roles/set_nfs_export/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - export_nfs + - set_nfs_export diff --git a/roles/set_nfs_export/vars/main.yml b/roles/set_nfs_export/vars/main.yml deleted file mode 100644 index 9deb28589..000000000 --- a/roles/set_nfs_export/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for export_nfs diff --git a/roles/set_nfs_mount/tests/test.yml b/roles/set_nfs_mount/tests/test.yml index 10177c473..f43f41373 100644 --- a/roles/set_nfs_mount/tests/test.yml +++ b/roles/set_nfs_mount/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - mount_nfs + - set_nfs_mount