From 8673da0e7843178805af4d4fdfd64a0480e17186 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 13 Jun 2024 16:26:53 +0200 Subject: [PATCH] verify-build-and-generatelists: Adjust to use --engine and --git-url for SLFO based products. --- verify-build-and-generatelists | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/verify-build-and-generatelists b/verify-build-and-generatelists index b63b3f56..e922589d 100755 --- a/verify-build-and-generatelists +++ b/verify-build-and-generatelists @@ -1,9 +1,25 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash PROJECT=$1 LOG_DIR="/var/log/openSUSE-release-tools/${PROJECT}" +IBS_PRODUCT_PREFIX="SUSE:SLFO:Products:" +GITEA_PRODUCTS_URL="https://src.suse.de/products/" [ ! -d "${LOG_DIR}" ] && mkdir ${LOG_DIR} + +ibs_to_gitea_product() { + printf '%s' "${GITEA_PRODUCTS_URL}$(printf '%s' "${PROJECT}" | sed "s/${IBS_PRODUCT_PREFIX}//" | sed -E 's/:/\#/g')" +} + + +pkglistgen_extra_args() { + if [[ ${PROJECT} =~ ^${IBS_PRODUCT_PREFIX}.* ]] ; then + printf '%s' "--engine product_composer --git-url $(ibs_to_gitea_product)" + else + printf '' + fi +} + logger() { date -Is >> ${LOG_DIR}/pkglistgen.log echo "$1" >> ${LOG_DIR}/pkglistgen.log @@ -11,7 +27,7 @@ logger() { polling_repo() { logger "[CHECKING] Checking standard repository from ${PROJECT}" - OUTPUT=$(timeout 3m /usr/share/openSUSE-release-tools/verify-repo-built-successful.py -A ${API_URL} -p ${PROJECT} -r standard 2>&1) + OUTPUT=$(timeout 3m /usr/share/openSUSE-release-tools/verify-repo-built-successful.py -A ${API_URL} -p ${PROJECT} -r standard $(pkglistgen_extra_args) 2>&1) RETURNCODE=$? if [ ${RETURNCODE} -eq 0 ]; then logger "[READY] Repository is NOT building"