From 239e88c6e019ddcf29eb562cfd60d03adbaf84bd Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Tue, 16 Jan 2024 17:41:00 +0000
Subject: [PATCH] Missed change in 5ea3bf3a9dbd7e128cf8a899b6c06958cdfcbf36

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 tools/pkg/build.py          | 10 ++++++++--
 tools/pkg/repo/create.py    |  2 +-
 tools/release.py            |  6 +++---
 tools/testsuite/download.py |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/pkg/build.py b/tools/pkg/build.py
index d9622456c4b..c2c37eaa1f9 100644
--- a/tools/pkg/build.py
+++ b/tools/pkg/build.py
@@ -483,7 +483,10 @@ def onedir_dependencies(
         assert package_name is not None
         assert platform is not None
 
-    if platform not in ("macos", "darwin") and arch == "arm64":
+    if platform == "darwin":
+        platform = "macos"
+
+    if platform != "macos" and arch == "arm64":
         arch = "aarch64"
 
     shared_constants = _get_shared_constants()
@@ -622,6 +625,9 @@ def salt_onedir(
         assert platform is not None
         assert package_name is not None
 
+    if platform == "darwin":
+        platform = "macos"
+
     shared_constants = _get_shared_constants()
     if not relenv_version:
         relenv_version = shared_constants["relenv_version"]
@@ -703,7 +709,7 @@ def salt_onedir(
             str(salt_archive),
             env=env,
         )
-        if platform == "darwin":
+        if platform == "macos":
 
             def errfn(fn, path, err):
                 ctx.info(f"Removing {path} failed: {err}")
diff --git a/tools/pkg/repo/create.py b/tools/pkg/repo/create.py
index 8e0926c1a41..f307bd9dbc7 100644
--- a/tools/pkg/repo/create.py
+++ b/tools/pkg/repo/create.py
@@ -917,7 +917,7 @@ def _create_onedir_based_repo(
         if distro == "onedir":
             if "-onedir-linux-" in dpath.name.lower():
                 release_os = "linux"
-            elif "-onedir-darwin-" in dpath.name.lower():
+            elif "-onedir-macos-" in dpath.name.lower():
                 release_os = "macos"
             elif "-onedir-windows-" in dpath.name.lower():
                 release_os = "windows"
diff --git a/tools/release.py b/tools/release.py
index 9bc5b07eff5..808c733a049 100644
--- a/tools/release.py
+++ b/tools/release.py
@@ -133,13 +133,13 @@ def download_onedir_artifact(
     Download onedir artifact from staging bucket.
     """
     s3 = boto3.client("s3")
-    if platform == "macos":
-        platform = "darwin"
+    if platform == "darwin":
+        platform = "macos"
     if arch == "arm64":
         arch = "aarch64"
     arch = arch.lower()
     platform = platform.lower()
-    if platform in ("linux", "darwin") and arch not in ("x86_64", "aarch64"):
+    if platform in ("linux", "macos") and arch not in ("x86_64", "aarch64"):
         ctx.error(
             f"The 'arch' value for {platform} must be one of: 'x86_64', 'aarch64', 'arm64'"
         )
diff --git a/tools/testsuite/download.py b/tools/testsuite/download.py
index 15d66ffa87c..d70dfb5f384 100644
--- a/tools/testsuite/download.py
+++ b/tools/testsuite/download.py
@@ -38,7 +38,7 @@ download = command_group(
         },
         "platform": {
             "help": "The onedir platform artifact to download",
-            "choices": ("linux", "darwin", "windows"),
+            "choices": ("linux", "macos", "windows"),
             "required": True,
         },
         "arch": {