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

[WIP] Test build to check PR process #1989

Closed
wants to merge 3 commits into from
Closed

[WIP] Test build to check PR process #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ddcf5d
Test build to check PR process
Feb 5, 2024
6f526a8
Trying to get a clean build
Feb 5, 2024
06c102b
Updated 3005.1 to 3005.5
Feb 6, 2024
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
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
display-name: Windows 2019
timeout: 20
runs-on: windows-2019
instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'


windows-2022:
Expand All @@ -219,7 +219,7 @@ jobs:
display-name: Windows 2022
timeout: 20
runs-on: windows-2022
instances: '["stable-3005", "stable-3005-1", "stable-3006", "stable-3006-1", "latest"]'
instances: '["stable-3005", "stable-3005-5", "stable-3006", "stable-3006-1", "latest"]'



Expand All @@ -234,7 +234,7 @@ jobs:
distro-slug: almalinux-8
display-name: AlmaLinux 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


almalinux-9:
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
distro-slug: amazon-2
display-name: Amazon 2
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


arch:
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
distro-slug: centos-7
display-name: CentOS 7
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


centos-stream8:
Expand All @@ -304,7 +304,7 @@ jobs:
distro-slug: centos-stream8
display-name: CentOS Stream 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


centos-stream9:
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
distro-slug: debian-10
display-name: Debian 10
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


debian-11:
Expand All @@ -346,7 +346,7 @@ jobs:
distro-slug: debian-11
display-name: Debian 11
timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'


fedora-36:
Expand Down Expand Up @@ -458,7 +458,7 @@ jobs:
distro-slug: oraclelinux-7
display-name: Oracle Linux 7
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


oraclelinux-8:
Expand All @@ -472,7 +472,7 @@ jobs:
distro-slug: oraclelinux-8
display-name: Oracle Linux 8
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


photon-3:
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
distro-slug: rockylinux-8
display-name: Rocky Linux 8
timeout: 20
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'
instances: '["old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "latest", "default"]'


rockylinux-9:
Expand Down Expand Up @@ -542,7 +542,7 @@ jobs:
distro-slug: ubuntu-2004
display-name: Ubuntu 20.04
timeout: 20
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["old-stable-3003", "old-stable-3004", "old-stable-3005", "stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'


ubuntu-2204:
Expand All @@ -556,7 +556,7 @@ jobs:
distro-slug: ubuntu-2204
display-name: Ubuntu 22.04
timeout: 20
instances: '["stable-3005", "onedir-3005", "stable-3005-1", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'
instances: '["stable-3005", "onedir-3005", "stable-3005-5", "stable-3006", "onedir-3006", "stable-3006-1", "git-master", "latest", "default"]'


set-pipeline-exit-status:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/templates/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
"3003",
"3004",
"3005",
"3005-1",
"3005-5",
"3006",
"3006-1",
"master",
Expand All @@ -308,7 +308,7 @@
"3003": "v3003",
"3004": "v3004",
"3005": "v3005",
"3005-1": "v3005.1",
"3005-5": "v3005.5",
"3006": "v3006",
"3006-1": "v3006.1",
"master": "Master",
Expand All @@ -317,7 +317,7 @@
}

OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3005-5",
"3006",
"3006-1",
"master",
Expand All @@ -332,7 +332,7 @@
]

MAC_OLD_STABLE_VERSION_BLACKLIST = [
"3005-1",
"3005-5",
"3006",
"3006-1",
"master",
Expand All @@ -343,13 +343,13 @@
"3003",
"3004",
"3005",
"3005-1",
"3005-5",
"master",
"nightly",
]

GIT_VERSION_BLACKLIST = [
"3005-1",
"3005-5",
"3006-1",
"nightly",
]
Expand Down Expand Up @@ -677,7 +677,7 @@ def generate_test_jobs():
"3003": BLACKLIST_3003,
"3004": BLACKLIST_3004,
"3005": BLACKLIST_3005,
"3005-1": BLACKLIST_3005,
"3005-5": BLACKLIST_3005,
"3006": BLACKLIST_3006,
"3006-1": BLACKLIST_3006,
}
Expand All @@ -698,7 +698,7 @@ def generate_test_jobs():

if (
salt_version
in ("3003", "3004", "3005", "3005-1", "3006", "3006-1", "master")
in ("3003", "3004", "3005", "3005-5", "3006", "3006-1", "master")
and distro in BLACKLIST[salt_version]
):
continue
Expand Down
28 changes: 14 additions & 14 deletions bootstrap-salt.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error

__ScriptVersion="2024.01.04"
__ScriptVersion="2024.02.05"
__ScriptName="bootstrap-salt.sh"

__ScriptFullName="$0"
Expand Down Expand Up @@ -335,7 +335,7 @@ __usage() {
- ${__ScriptName} onedir_rc 3006
- ${__ScriptName} old-stable
- ${__ScriptName} old-stable 3005
- ${__ScriptName} old-stable 3005.1
- ${__ScriptName} old-stable 3005.5


Options:
Expand Down Expand Up @@ -1450,16 +1450,16 @@ __gather_system_info() {
__ubuntu_derivatives_translation() {
UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|neon|pop)"
# Mappings
trisquel_6_ubuntu_base="12.04"
linuxmint_13_ubuntu_base="12.04"
linuxmint_17_ubuntu_base="14.04"
linuxmint_18_ubuntu_base="16.04"
linuxmint_19_ubuntu_base="18.04"
## trisquel_6_ubuntu_base="12.04"
## linuxmint_13_ubuntu_base="12.04"
## linuxmint_17_ubuntu_base="14.04"
## linuxmint_18_ubuntu_base="16.04"
## linuxmint_19_ubuntu_base="18.04"
linuxmint_20_ubuntu_base="20.04"
linaro_12_ubuntu_base="12.04"
elementary_os_02_ubuntu_base="12.04"
neon_16_ubuntu_base="16.04"
neon_18_ubuntu_base="18.04"
## linaro_12_ubuntu_base="12.04"
## elementary_os_02_ubuntu_base="12.04"
## neon_16_ubuntu_base="16.04"
## neon_18_ubuntu_base="18.04"
neon_20_ubuntu_base="20.04"
neon_22_ubuntu_base="22.04"
pop_22_ubuntu_base="22.04"
Expand Down Expand Up @@ -4651,7 +4651,7 @@ __install_saltstack_rhel_repository() {
# Instead, this should work correctly on all RHEL variants.
base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7"
gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7.key"
elif [ "${DISTRO_MAJOR_VERSION}" -ge 9 ]; then
gpg_key="SALTSTACK-GPG-KEY2.pub"
else
Expand Down Expand Up @@ -6413,7 +6413,7 @@ install_amazon_linux_ami_2_deps() {
fi

base_url="$HTTP_VAL://${_REPO_URL}/${__PY_VERSION_REPO}/amazon/2/\$basearch/$repo_rev/"
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7.key"
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
fi
Expand Down Expand Up @@ -6504,7 +6504,7 @@ install_amazon_linux_ami_2_onedir_deps() {
fi

if [ "$(echo "${ONEDIR_REV}" | grep -E '(3004|3005)')" != "" ] || [ "${ONEDIR_REV}" = "nightly" ]; then
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7.key"
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
fi
Expand Down
2 changes: 1 addition & 1 deletion kitchen.macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ suites:
- name: old-stable-3005
provisioner:
salt_bootstrap_options: -MP old-stable %s
salt_version: 3005.1
salt_version: 3005.5
salt_call_command: /opt/salt/bin/salt-call
- name: stable-3006
provisioner:
Expand Down
4 changes: 2 additions & 2 deletions kitchen.windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ suites:
salt_call_command: c:\Program Files\Salt Project\Salt\salt-call.bat
- name: stable-3005
provisioner:
salt_version: 3005.1-1
salt_version: 3005.5-1
- name: stable-3005-1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this likely need's to be changed to stable-3005-5, too

provisioner:
salt_version: 3005.1-1
salt_version: 3005.5-1
- name: stable-3006
provisioner:
salt_version: 3006.0
Expand Down
2 changes: 1 addition & 1 deletion kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ suites:
- openbsd-6
- name: stable-3005-1
Copy link

@blu-base blu-base Feb 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the valie need's to be changed to stable-3005-5

provisioner:
salt_version: 3005.1
salt_version: 3005.5
salt_bootstrap_options: -x python3 -MP stable %s
excludes:
- opensuse-15
Expand Down
Loading