From 606770fd77553f1cebd686a6708fcb7b61436706 Mon Sep 17 00:00:00 2001 From: Viktor Berke Date: Sun, 12 Nov 2023 21:19:33 +0100 Subject: [PATCH] Distro and namespace updates --- .githooks/pre-commit | 2 +- .../{fedora-37.yml => fedora-38.yml} | 4 +-- .github/workflows/fedora-39.yml | 26 +++++++++++++++++++ README.md | 3 ++- requirements.yml | 12 ++++----- roles/install/tasks/autokick.yml | 2 +- roles/install/tasks/firewalld.yml | 4 +-- roles/install/tasks/kf2-classic.yml | 4 +-- roles/install/tasks/main.yml | 2 +- roles/install/tasks/os.yml | 2 +- roles/uninstall/tasks/firewalld.yml | 2 +- roles/uninstall/tasks/systemd.yml | 6 ++--- test.sh | 2 +- 13 files changed, 49 insertions(+), 22 deletions(-) rename .github/workflows/{fedora-37.yml => fedora-38.yml} (93%) create mode 100644 .github/workflows/fedora-39.yml diff --git a/.githooks/pre-commit b/.githooks/pre-commit index d43ad73..af9e9c9 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,4 +1,4 @@ #!/bin/bash yamllint --strict . -ansible-lint --strict +ansible-lint --strict --offline diff --git a/.github/workflows/fedora-37.yml b/.github/workflows/fedora-38.yml similarity index 93% rename from .github/workflows/fedora-37.yml rename to .github/workflows/fedora-38.yml index 2eac143..f8128b1 100644 --- a/.github/workflows/fedora-37.yml +++ b/.github/workflows/fedora-38.yml @@ -1,5 +1,5 @@ --- -name: Fedora 37 +name: Fedora 38 on: # yamllint disable-line rule:truthy push: @@ -18,7 +18,7 @@ jobs: - name: Test Galaxy role run: > CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro - --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:37) && + --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:38) && podman exec ${CONT_ID} /bin/bash -c "./install.sh --extra-vars 'skip_kfgame=true' <<< y && ./uninstall.sh <<< y && diff --git a/.github/workflows/fedora-39.yml b/.github/workflows/fedora-39.yml new file mode 100644 index 0000000..e8fc523 --- /dev/null +++ b/.github/workflows/fedora-39.yml @@ -0,0 +1,26 @@ +--- +name: Fedora 39 + +on: # yamllint disable-line rule:truthy + push: + branches: + - main + - master + pull_request: + branches: [] + +jobs: + ansible-ci: + runs-on: ubuntu-latest + steps: + - name: Obtain sources + uses: actions/checkout@v3 + - name: Test Galaxy role + run: > + CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro + --tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:39) && + podman exec ${CONT_ID} /bin/bash -c + "./install.sh --extra-vars 'skip_kfgame=true' <<< y && + ./uninstall.sh <<< y && + ./install.sh --extra-vars 'skip_kfgame=true kf2_classic=true' <<< y" && + podman stop ${CONT_ID} diff --git a/README.md b/README.md index ba73d84..c84f4a6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ | Linter | ✅ | [![Lint](https://github.com/noobient/killinuxfloor/actions/workflows/lint.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/lint.yml) | | AlmaLinux 8 | ✅ | [![AlmaLinux 8](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-8.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-8.yml) | | AlmaLinux 9 | ✅ | [![AlmaLinux 9](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-9.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-9.yml) | -| Fedora 37 | ✅ | [![Fedora 37](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-37.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-37.yml) | +| Fedora 38 | ✅ | [![Fedora 38](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-38.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-38.yml) | +| Fedora 39 | ✅ | [![Fedora 39](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-39.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-39.yml) | | Ubuntu 20.04 | ✅ | [![Ubuntu 20.04](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-20.04.yml) | | Ubuntu 22.04 | ✅ | [![Ubuntu 22.04](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-22.04.yml) | diff --git a/requirements.yml b/requirements.yml index 507622a..907c10a 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- -- src: bviktor.firewalld -- src: bviktor.github_release -- src: bviktor.logrotate -- src: bviktor.selinux_cil -- src: bviktor.servicecheck -- src: bviktor.thirdparty +- src: noobient.firewalld +- src: noobient.github_release +- src: noobient.logrotate +- src: noobient.selinux_cil +- src: noobient.servicecheck +- src: noobient.thirdparty diff --git a/roles/install/tasks/autokick.yml b/roles/install/tasks/autokick.yml index da0b05a..c1dc5f4 100644 --- a/roles/install/tasks/autokick.yml +++ b/roles/install/tasks/autokick.yml @@ -13,7 +13,7 @@ when: ansible_os_family == 'Debian' - include_role: - name: bviktor.thirdparty + name: noobient.thirdparty vars: name: Yarn gpg_url: "https://dl.yarnpkg.com/{% if ansible_os_family == 'RedHat' %}rpm{% else %}debian{% endif %}/pubkey.gpg" diff --git a/roles/install/tasks/firewalld.yml b/roles/install/tasks/firewalld.yml index a7e9087..9a4b480 100644 --- a/roles/install/tasks/firewalld.yml +++ b/roles/install/tasks/firewalld.yml @@ -38,7 +38,7 @@ notify: Reload journald configuration - include_role: - name: bviktor.firewalld + name: noobient.firewalld vars: service: kf2 port: "{{ item }}" @@ -51,7 +51,7 @@ - 8080/tcp - include_role: - name: bviktor.logrotate + name: noobient.logrotate vars: name: firewalld-denied pattern: |- diff --git a/roles/install/tasks/kf2-classic.yml b/roles/install/tasks/kf2-classic.yml index 642ba3c..a942ede 100644 --- a/roles/install/tasks/kf2-classic.yml +++ b/roles/install/tasks/kf2-classic.yml @@ -6,7 +6,7 @@ when: ansible_os_family == 'RedHat' - include_role: - name: bviktor.thirdparty + name: noobient.thirdparty vars: name: '.NET Runtime' gpg_url: 'https://packages.microsoft.com/keys/microsoft.asc' @@ -15,7 +15,7 @@ when: ansible_os_family == 'Debian' - include_role: - name: bviktor.github_release + name: noobient.github_release vars: owner: 'SteamRE' repo: 'DepotDownloader' diff --git a/roles/install/tasks/main.yml b/roles/install/tasks/main.yml index fd49a89..6e6b94c 100644 --- a/roles/install/tasks/main.yml +++ b/roles/install/tasks/main.yml @@ -4,7 +4,7 @@ - include_tasks: user.yml - include_role: - name: bviktor.selinux_cil + name: noobient.selinux_cil vars: module: killinuxfloor diff --git a/roles/install/tasks/os.yml b/roles/install/tasks/os.yml index 72e69ce..6abe0af 100644 --- a/roles/install/tasks/os.yml +++ b/roles/install/tasks/os.yml @@ -19,7 +19,7 @@ # Here we check not only the KF2 service, but also systemd state # Used in e.g. init, config, systemd - include_role: - name: bviktor.servicecheck + name: noobient.servicecheck vars: unit: kf2.service diff --git a/roles/uninstall/tasks/firewalld.yml b/roles/uninstall/tasks/firewalld.yml index 3e37ee1..9bc4123 100644 --- a/roles/uninstall/tasks/firewalld.yml +++ b/roles/uninstall/tasks/firewalld.yml @@ -1,6 +1,6 @@ --- - include_role: - name: bviktor.firewalld + name: noobient.firewalld vars: service: 'kf2' enabled: false diff --git a/roles/uninstall/tasks/systemd.yml b/roles/uninstall/tasks/systemd.yml index 3226006..c8026ed 100644 --- a/roles/uninstall/tasks/systemd.yml +++ b/roles/uninstall/tasks/systemd.yml @@ -1,6 +1,6 @@ --- - include_role: - name: bviktor.servicecheck + name: noobient.servicecheck vars: unit: kf2.service @@ -12,7 +12,7 @@ when: servicecheck.exists - include_role: - name: bviktor.servicecheck + name: noobient.servicecheck vars: unit: kf2autokick.service @@ -24,7 +24,7 @@ when: servicecheck.exists - include_role: - name: bviktor.servicecheck + name: noobient.servicecheck vars: unit: kf2watchdog.service diff --git a/test.sh b/test.sh index 0763bd0..96789c3 100755 --- a/test.sh +++ b/test.sh @@ -4,7 +4,7 @@ set -u if [ $# -lt 1 ] then - platform="fedora:37" + platform="fedora:39" else platform="${1}" fi