From 9d9357647e025234e205ba2475fc5ce76b69899f Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 21 Feb 2024 12:07:16 -0700 Subject: [PATCH] change lh to s --- mangle/generators/common | 1 + mangle/generators/common_10 | 3 ++- mangle/generators/common_8 | 1 + mangle/generators/common_9 | 3 ++- mangle/generators/generate_comps | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mangle/generators/common b/mangle/generators/common index 16081a9..51d01fe 100644 --- 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 index 875d3cf..06cdee5 100644 --- 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 index 59f9fd9..5a185e4 100644 --- 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 index d36dced..2a13ac3 100644 --- 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 index 10d8f80..05d8037 100755 --- 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