Merge pull request #7813 from avshiliaev/revert-helm-proxy-package-na…

…me-for-tito-tagging Fix the problem with the full package name of the proxy helm chart when tagging with tito
uyuni-project · Nov 2, 2023 · 2b6c822 · 2b6c822
2 parents b43982e + c0fcf04
commit 2b6c822
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/containers/proxy-helm/Chart.yaml b/containers/proxy-helm/Chart.yaml
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: uyuni/proxy:latest
+#!BuildTag: uyuni/proxy-helm:latest
 apiVersion: v2
-name: proxy
+name: proxy-helm
 description: Uyuni proxy containers.
 type: application
 home: https://www.uyuni-project.org/

diff --git a/containers/proxy-helm/proxy-helm.changes.avshiliaev.name-revert b/containers/proxy-helm/proxy-helm.changes.avshiliaev.name-revert
@@ -0,0 +1 @@
+- Reverted the name of the package from proxy to proxy-helm to avoid problems with release tagging
diff --git a/rel-eng/push-packages-to-obs.sh b/rel-eng/push-packages-to-obs.sh
@@ -282,7 +282,7 @@ while read PKG_NAME; do
   fi
 
   if [ -f "$SRPM_PKG_DIR/Chart.yaml" ]; then
-      NAME="${PKG_NAME%%-helm}"
+      NAME="${PKG_NAME}"
       if [ "${OSCAPI}" == "https://api.suse.de" ]; then
           # SUSE Manager settings
           VERSION=$(sed 's/^\([0-9]\+\.[0-9]\+\).*$/\1/' ${BASE_DIR}/packages/uyuni-base)