From de40a6d5684af5b5e800aad9bf4fc484fea40a05 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 10 Apr 2023 20:49:40 -0400
Subject: [PATCH] Remove all the decimals in photon versions

---
 .github/workflows/nightly.yml                        | 8 ++++----
 .github/workflows/staging.yml                        | 8 ++++----
 .github/workflows/templates/build-rpm-repo.yml.jinja | 8 ++++----
 pkg/tests/download/test_pkg_download.py              | 8 ++++----
 tools/pkg/repo.py                                    | 2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f85848dfba7..51b3ca2f1ec 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -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:
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index fcc68d7ba18..4f66b090d59 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -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:
diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja
index 8fc9e79680f..49316861d47 100644
--- a/.github/workflows/templates/build-rpm-repo.yml.jinja
+++ b/.github/workflows/templates/build-rpm-repo.yml.jinja
@@ -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 }>"
diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py
index bd561fc6d49..b052d5d9ae0 100644
--- a/pkg/tests/download/test_pkg_download.py
+++ b/pkg/tests/download/test_pkg_download.py
@@ -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",
         },
     ]
diff --git a/tools/pkg/repo.py b/tools/pkg/repo.py
index 6b6708e7529..c8bcb5b55e2 100644
--- a/tools/pkg/repo.py
+++ b/tools/pkg/repo.py
@@ -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"],
 }