From 4278441ef2f90654b0e8c747164278d55382da2b Mon Sep 17 00:00:00 2001
From: Victor Morales <chipahuac@hotmail.com>
Date: Fri, 15 Mar 2024 13:43:23 -0700
Subject: [PATCH] Add rocky 8 and ubuntu jammy distro support

---
 .github/workflows/on-demand_ci.yml |  2 +-
 .textlintrc                        | 10 ++++++++++
 README.md                          | 11 ++++++-----
 ci/update_distros.sh               |  5 +++--
 distros_supported.yml              | 17 ++++++++++-------
 setup.sh                           |  1 +
 6 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 .textlintrc

diff --git a/.github/workflows/on-demand_ci.yml b/.github/workflows/on-demand_ci.yml
index ca00f97..3959185 100644
--- a/.github/workflows/on-demand_ci.yml
+++ b/.github/workflows/on-demand_ci.yml
@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu_focal, ubuntu_bionic, centos_8, centos_7, opensuse_tumbleweed]
+        os: [ubuntu_focal, ubuntu_bionic, ubuntu_jammy, rocky_8, centos_7, opensuse_tumbleweed]
         provider: [all]
         include:
           - os: opensuse_leap
diff --git a/.textlintrc b/.textlintrc
new file mode 100644
index 0000000..073dc1d
--- /dev/null
+++ b/.textlintrc
@@ -0,0 +1,10 @@
+{
+  "rules": {
+    "terminology": {
+      "terms": [
+        "https",
+        ["repo\\b", "repository"],
+      ]
+    }
+  }
+}
diff --git a/README.md b/README.md
index 616223e..20acccd 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,12 @@ installation of its dependencies, plugins and providers.
 
 ## Linux Distros supported
 
-| Name       | Version         |
-|:-----------|:---------------:|
-| Ubuntu     | 18.04/20.04     |
-| CentOS     | 7/8             |
-| openSUSE   | Tumbleweed/Leap |
+| Name       | Version           |
+|:-----------|:-----------------:|
+| Ubuntu     | 18.04/20.04/22.04 |
+| CentOS     | 7                 |
+| Rocky      | 8                 |
+| openSUSE   | Tumbleweed/Leap   |
 
 ## Vagrant Providers supported
 
diff --git a/ci/update_distros.sh b/ci/update_distros.sh
index bd5e079..e6d5ddc 100755
--- a/ci/update_distros.sh
+++ b/ci/update_distros.sh
@@ -74,7 +74,7 @@ cat <<EOT >.distros_supported.yml
 ---
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
-# Copyright (c) 2019
+# Copyright (c) 2019 - $(date '+%Y')
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -85,9 +85,10 @@ linux:
 EOT
 
 _vagrant_pull "centos_7" "centos/7"
-_vagrant_pull "centos_8" "centos/stream8"
+_vagrant_pull "rocky_8" "rockylinux/8"
 _vagrant_pull "ubuntu_bionic" "generic/ubuntu1804"
 _vagrant_pull "ubuntu_focal" "generic/ubuntu2004"
+_vagrant_pull "ubuntu_jammy" "generic/ubuntu2204"
 _vagrant_pull "opensuse_tumbleweed" "opensuse/Tumbleweed.x86_64"
 _vagrant_pull "opensuse_leap" "opensuse/Leap-15.2.x86_64"
 
diff --git a/distros_supported.yml b/distros_supported.yml
index a24bdb5..94be9e1 100644
--- a/distros_supported.yml
+++ b/distros_supported.yml
@@ -1,7 +1,7 @@
 ---
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
-# Copyright (c) 2019
+# Copyright (c) 2019 - 2024
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -12,18 +12,21 @@ linux:
   - alias: centos_7
     name: centos/7
     version: "2004.01"
-  - alias: centos_8
-    name: centos/stream8
-    version: "20210210.0"
+  - alias: rocky_8
+    name: rockylinux/8
+    version: "9.0.0"
   - alias: ubuntu_bionic
     name: generic/ubuntu1804
-    version: "4.2.6"
+    version: "4.3.12"
   - alias: ubuntu_focal
     name: generic/ubuntu2004
-    version: "4.2.6"
+    version: "4.3.12"
+  - alias: ubuntu_jammy
+    name: generic/ubuntu2204
+    version: "4.3.12"
   - alias: opensuse_tumbleweed
     name: opensuse/Tumbleweed.x86_64
-    version: "1.0.20221230"
+    version: "1.0.20240313"
   - alias: opensuse_leap
     name: opensuse/Leap-15.2.x86_64
     version: "15.2.31.632"
diff --git a/setup.sh b/setup.sh
index 547cd9d..ba23fca 100755
--- a/setup.sh
+++ b/setup.sh
@@ -269,6 +269,7 @@ function _install_deps {
         $INSTALLER_CMD qemu || :
         pkgs+=" bridge-utils dnsmasq ebtables libvirt"
         pkgs+=" qemu-kvm ruby-devel gcc nfs make libguestfs"
+        pkgs+=" pkgconf"
         if [[ ${ID,,} != *"centos"* ]] && [[ ${VERSION_ID} != *8* ]]; then
             pkgs+=" qemu-utils"
         fi