Skip to content

Commit

Permalink
Add rocky 8 and ubuntu jammy distro support
Browse files Browse the repository at this point in the history
  • Loading branch information
electrocucaracha committed Mar 15, 2024
1 parent 7667a8f commit 4278441
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-demand_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions .textlintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"rules": {
"terminology": {
"terms": [
"https",
["repo\\b", "repository"],
]
}
}
}
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions ci/update_distros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand Down
17 changes: 10 additions & 7 deletions distros_supported.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
1 change: 1 addition & 0 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4278441

Please sign in to comment.