saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove all the decimals in photon versions

Browse source
This commit is contained in:
MKLeb 2023-04-10 20:49:40 -04:00 • committed by Gareth J. Greenaway
parent 6e289e74da
commit de40a6d568
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/nightly.yml vendored
View file

@ -1541,16 +1541,16 @@ jobs:
version: "38"
arch: aarch64
- distro: photon
version: "3.0"
version: "3"
arch: x86_64
- distro: photon
version: "3.0"
version: "3"
arch: aarch64
- distro: photon
version: "4.0"
version: "4"
arch: x86_64
- distro: photon
version: "4.0"
version: "4"
arch: aarch64
steps:

8
.github/workflows/staging.yml vendored
View file

@ -1538,16 +1538,16 @@ jobs:
version: "38"
arch: aarch64
- distro: photon
version: "3.0"
version: "3"
arch: x86_64
- distro: photon
version: "3.0"
version: "3"
arch: aarch64
- distro: photon
version: "4.0"
version: "4"
arch: x86_64
- distro: photon
version: "4.0"
version: "4"
arch: aarch64
steps:

8
.github/workflows/templates/build-rpm-repo.yml.jinja vendored
View file

@ -18,10 +18,10 @@
("fedora", "37", "aarch64"),
("fedora", "38", "x86_64"),
("fedora", "38", "aarch64"),
("photon", "3.0", "x86_64"),
("photon", "3.0", "aarch64"),
("photon", "4.0", "x86_64"),
("photon", "4.0", "aarch64"),
("photon", "3", "x86_64"),
("photon", "3", "aarch64"),
("photon", "4", "x86_64"),
("photon", "4", "aarch64"),
) %>
- distro: <{ distro }>
version: "<{ version }>"

8
pkg/tests/download/test_pkg_download.py
View file

@ -104,15 +104,15 @@ def get_test_versions():
"container_id": "ubuntu_22_04",
},
{
"image": "ghcr.io/saltstack/salt-ci-containers/photon:3.0",
"image": "ghcr.io/saltstack/salt-ci-containers/photon:3",
"os_type": "photon",
"os_version": 3.0,
"os_version": 3,
"container_id": "photon_3",
},
{
"image": "ghcr.io/saltstack/salt-ci-containers/photon:4.0",
"image": "ghcr.io/saltstack/salt-ci-containers/photon:4",
"os_type": "photon",
"os_version": 4.0,
"os_version": 4,
"container_id": "photon_4",
},
]

2
tools/pkg/repo.py
View file

@ -322,7 +322,7 @@ _rpm_distro_info = {
"amazon": ["2"],
"redhat": ["7", "8", "9"],
"fedora": ["36", "37", "38"],
"photon": ["3.0", "4.0"],
"photon": ["3", "4"],
}