change lh to s

rocky-linux · Feb 21, 2024 · 9d93576 · 9d93576
1 parent f6776e5
commit 9d93576
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/mangle/generators/common b/mangle/generators/common
@@ -16,6 +16,7 @@ if [ "$?" -ne 0 ]; then
   exit 1
 fi
 
+GIT_URL="https://git.rockylinux.org"
 STREAM_COMPOSE_BASEURL="https://composes.stream.centos.org/production"
 STREAM_KOJI_REPO="https://kojihub.stream.centos.org/kojifiles/repos"
 ELN_KOJI_REPO="https://kojipkgs.fedoraproject.org/repos"

diff --git a/mangle/generators/common_10 b/mangle/generators/common_10
@@ -3,12 +3,13 @@
 REPO=("BaseOS" "AppStream" "CRB" "HighAvailability" "ResilientStorage" "NFV" "RT" "SAP" "SAPHANA")
 ARCH=("aarch64" "ppc64le" "s390x" "x86_64")
 
+MAJOR="10"
 VER="r${MAJOR}${LH}"
 
 case "$VER" in
   r10)
     export PERIDOT_PROJECT_ID=474db218-5282-4ec7-8db2-4fb80a59c850 ;;
-  r10lh)
+  r10s)
     export PERIDOT_PROJECT_ID=474db218-5282-4ec7-8db2-4fb80a59c850 ;;
   *)
     echo "Not supported"

diff --git a/mangle/generators/common_8 b/mangle/generators/common_8
@@ -2,3 +2,4 @@
 
 REPO=("BaseOS" "AppStream" "PowerTools" "HighAvailability" "ResilientStorage" "NFV" "RT")
 ARCH=("aarch64" "x86_64")
+MAJOR="8"
diff --git a/mangle/generators/common_9 b/mangle/generators/common_9
@@ -3,12 +3,13 @@
 REPO=("BaseOS" "AppStream" "CRB" "HighAvailability" "ResilientStorage" "NFV" "RT" "SAP" "SAPHANA")
 ARCH=("aarch64" "ppc64le" "s390x" "x86_64")
 
+MAJOR="9"
 VER="r${MAJOR}${LH}"
 
 case "$VER" in
   r9)
     export PERIDOT_PROJECT_ID=dff20351-7d36-4f7c-9eea-7f039f5026d0 ;;
-  r9lh)
+  r9s)
     export PERIDOT_PROJECT_ID=6202c09e-6252-4d3a-bcd3-9c7751682970 ;;
   *)
     echo "Not supported"

diff --git a/mangle/generators/generate_comps b/mangle/generators/generate_comps
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 source common
 
 if [ ! -f "/usr/bin/pungi-koji" ]; then
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		REPO=("BaseOS" "AppStream" "PowerTools" "HighAvailability" "ResilientStorage" "NFV" "RT")
		ARCH=("aarch64" "x86_64")
		MAJOR="8"