Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for Fedora and Photon #1920

Merged
merged 16 commits into from
Apr 24, 2023
Merged

Updates for Fedora and Photon #1920

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e34deff
Updating bootstratp to install Salt built Fedora packages. Initial s…
garethgreenaway Apr 21, 2023
5ef7817
need to add photon-3 and photon-4 to list of Linux of distributions
garethgreenaway Apr 21, 2023
b5372f6
removing distros from latest blacklist which have latest packages ava…
garethgreenaway Apr 21, 2023
a8b51e4
fixing photon git installs, Using repo files for fedora and photon.
garethgreenaway Apr 21, 2023
7b735b1
blacklist Photon 3 and 4 from a couple git installs.
garethgreenaway Apr 21, 2023
6302ac3
Merge remote-tracking branch 'upstream/develop' into update_fedora_ad…
garethgreenaway Apr 21, 2023
ac20b82
removing extra GIT_VERSIONS_BLACKLIST
garethgreenaway Apr 21, 2023
2d64616
Blacklist Fedora-35 from latest so those are not available
garethgreenaway Apr 21, 2023
725834f
removing Fedora 35, as it is EOL as of December 13, 2022.
garethgreenaway Apr 21, 2023
fedc18b
Do not run git-master on Photon 4
garethgreenaway Apr 22, 2023
fe9b906
making GPG_KEY and REPO_FILE uppercase.
garethgreenaway Apr 22, 2023
5bdc4db
Fixing typos.
garethgreenaway Apr 22, 2023
432c6b6
Adding 3006 back in for Fedora
garethgreenaway Apr 22, 2023
4b7652f
Adding 3006 onedir back in for Fedora
garethgreenaway Apr 22, 2023
e52d077
some fixes to ensure git install works on Photon, in particular Photo…
garethgreenaway Apr 22, 2023
5c59021
uppercasing more variables
garethgreenaway Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ jobs:
distro-slug: almalinux-9
display-name: AlmaLinux 9
timeout: 20
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master", "latest"]'


amazon-2:
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
distro-slug: centos-stream9
display-name: CentOS Stream 9
timeout: 20
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master", "latest"]'


debian-10:
Expand Down Expand Up @@ -364,20 +364,6 @@ jobs:
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'


fedora-35:
name: Fedora 35
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: fedora-35
display-name: Fedora 35
timeout: 20
instances: '["git-master", "latest"]'


fedora-36:
name: Fedora 36
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
Expand All @@ -389,7 +375,7 @@ jobs:
distro-slug: fedora-36
display-name: Fedora 36
timeout: 20
instances: '["git-master", "latest"]'
instances: '["stable-3006", "onedir-3006", "git-master", "latest"]'


fedora-37:
Expand All @@ -403,7 +389,7 @@ jobs:
distro-slug: fedora-37
display-name: Fedora 37
timeout: 20
instances: '["latest"]'
instances: '["stable-3006", "onedir-3006", "latest"]'


fedora-38:
Expand All @@ -417,7 +403,7 @@ jobs:
distro-slug: fedora-38
display-name: Fedora 38
timeout: 20
instances: '["latest"]'
instances: '["stable-3006", "onedir-3006", "latest"]'


gentoo:
Expand Down Expand Up @@ -504,6 +490,34 @@ jobs:
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'


photon-3:
name: Photon OS 3
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: photon-3
display-name: Photon OS 3
timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest"]'


photon-4:
name: Photon OS 4
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: photon-4
display-name: Photon OS 4
timeout: 20
instances: '["stable-3006", "onedir-3006", "git-master", "latest"]'


rockylinux-8:
name: Rocky Linux 8
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
Expand All @@ -529,7 +543,7 @@ jobs:
distro-slug: rockylinux-9
display-name: Rocky Linux 9
timeout: 20
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master", "latest"]'


ubuntu-2004:
Expand Down Expand Up @@ -585,7 +599,6 @@ jobs:
- centos-stream9
- debian-10
- debian-11
- fedora-35
- fedora-36
- fedora-37
- fedora-38
Expand All @@ -595,6 +608,8 @@ jobs:
- opensuse-tumbleweed
- oraclelinux-7
- oraclelinux-8
- photon-3
- photon-4
- rockylinux-8
- rockylinux-9
- ubuntu-2004
Expand Down
56 changes: 32 additions & 24 deletions .github/workflows/templates/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"centos-stream9",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
Expand All @@ -26,6 +25,8 @@
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
Expand Down Expand Up @@ -55,7 +56,6 @@
"centos-stream8",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
Expand All @@ -65,6 +65,8 @@
"opensuse-tumbleweed",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"rockylinux-8",
"ubuntu-2004",
"ubuntu-2204",
Expand All @@ -79,8 +81,13 @@
"centos-stream9",
"debian-10",
"debian-11",
"fedora-36",
"fedora-37",
"fedora-38",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
Expand All @@ -98,6 +105,8 @@
"debian-11",
"oraclelinux-7",
"oraclelinux-8",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
Expand All @@ -109,14 +118,15 @@
"arch",
"centos-stream9",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2204",
Expand All @@ -129,14 +139,15 @@
"centos-stream9",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-8",
"rockylinux-9",
"ubuntu-2004",
Expand All @@ -148,27 +159,29 @@
"almalinux-9",
"arch",
"centos-stream9",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-9",
]

BLACKLIST_3005 = [
"arch",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
]

BLACKLIST_GIT_3004 = [
Expand All @@ -178,7 +191,6 @@
"centos-stream9",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
Expand All @@ -190,32 +202,31 @@
"ubuntu-2110",
"ubuntu-2204",
"rockylinux-9",
"photon-3",
"photon-4",
]

BLACKLIST_GIT_3005 = [
"amazon-2",
"arch",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]

BLACKLIST_3006 = [
"arch",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
Expand All @@ -229,20 +240,23 @@
"centos-stream9",
"debian-10",
"debian-11",
"fedora-35",
"fedora-36",
"fedora-37",
"fedora-38",
"gentoo",
"gentoo-systemd",
"opensuse-15",
"opensuse-tumbleweed",
"photon-3",
"photon-4",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2110",
"ubuntu-2204",
]

BLACKLIST_GIT_MASTER = []

SALT_VERSIONS = [
"3003",
"3004",
Expand Down Expand Up @@ -301,11 +315,7 @@
"rockylinux-8",
]

LATEST_PKG_BLACKLIST = [
"almalinux-9",
"centos-stream9",
"rockylinux-9",
]
LATEST_PKG_BLACKLIST = []

DISTRO_DISPLAY_NAMES = {
"almalinux-8": "AlmaLinux 8",
Expand All @@ -317,7 +327,6 @@
"centos-stream9": "CentOS Stream 9",
"debian-10": "Debian 10",
"debian-11": "Debian 11",
"fedora-35": "Fedora 35",
"fedora-36": "Fedora 36",
"fedora-37": "Fedora 37",
"fedora-38": "Fedora 38",
Expand All @@ -327,6 +336,8 @@
"opensuse-tumbleweed": "Opensuse Tumbleweed",
"oraclelinux-7": "Oracle Linux 7",
"oraclelinux-8": "Oracle Linux 8",
"photon-3": "Photon OS 3",
"photon-4": "Photon OS 4",
"rockylinux-8": "Rocky Linux 8",
"rockylinux-9": "Rocky Linux 9",
"ubuntu-2004": "Ubuntu 20.04",
Expand Down Expand Up @@ -566,10 +577,6 @@ def generate_test_jobs():
if distro not in STABLE_DISTROS:
continue

if distro.startswith("fedora") and salt_version != "latest":
# Fedora does not keep old builds around
continue

if bootstrap_type == "git":
if salt_version in GIT_VERSION_BLACKLIST:
continue
Expand All @@ -588,6 +595,7 @@ def generate_test_jobs():
"3004": BLACKLIST_GIT_3004,
"3005": BLACKLIST_GIT_3005,
"3006": BLACKLIST_GIT_3006,
"master": BLACKLIST_GIT_MASTER,
}

# .0 versions are a virtual version for pinning to the first
Expand All @@ -597,7 +605,7 @@ def generate_test_jobs():
continue

if (
salt_version in ("3003", "3004", "3005", "3006")
salt_version in ("3003", "3004", "3005", "3006", "master")
and distro in BLACKLIST[salt_version]
):
continue
Expand Down
Loading