From 25c98b2abd054b1741d295c9f370607d3b390e69 Mon Sep 17 00:00:00 2001
From: Mauro Morales <mauro.morales@spectrocloud.com>
Date: Thu, 7 Dec 2023 19:31:01 +0100
Subject: [PATCH] Fix naming issue in rc3 (#2065)

Have naming.sh deal separately with base and other artifacts
---
 images/naming.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/images/naming.sh b/images/naming.sh
index 2da8e6e92..2e2ea9ced 100755
--- a/images/naming.sh
+++ b/images/naming.sh
@@ -23,8 +23,24 @@ common_artifact_name() {
     echo 'KAIROS_VERSION must be defined'
     exit 1
   fi
+  if [ -z "$FLAVOR_RELEASE" ]; then
+    echo 'FLAVOR_RELEASE must be defined'
+    exit 1
+  fi
+  if [ -z "$VARIANT" ]; then
+    echo 'VARIANT must be defined'
+    exit 1
+  fi
+  if [ -z "$TARGETARCH" ]; then
+    echo 'TARGETARCH must be defined'
+    exit 1
+  fi
+  if [ -z "$MODEL" ]; then
+    echo 'MODEL must be defined'
+    exit 1
+  fi
 
-  echo "$(common_artifact_base_name)-$KAIROS_VERSION"
+  echo "$FLAVOR_RELEASE-$VARIANT-$TARGETARCH-$MODEL-$KAIROS_VERSION"
 }
 
 common_artifact_base_name() {