diff --git a/scripts/post_all_factory.sh b/scripts/post_all_factory.sh index 108751a5..4094398a 100644 --- a/scripts/post_all_factory.sh +++ b/scripts/post_all_factory.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x @@ -33,6 +33,7 @@ do latest_iso=$(get_latest_iso "${version}" "${arch}" "${media}") test -f "${FACTORY_ISO_FIXED_DIR}/${latest_iso}" || \ (cd "${FACTORY_ISO_FIXED_DIR}" || exit; curl -LOR "${ISO_URL_BASE}/${version_major}/isos/${arch}/${latest_iso}") + if [ "${version_major}" == "8" ]; then openqa-cli api -X POST isos \ ISO="${latest_iso}" \ @@ -70,6 +71,7 @@ do latest_iso=$(get_latest_iso "${version}" "${arch}" "${media}") test -f "${FACTORY_ISO_FIXED_DIR}/${latest_iso}" || \ (cd "${FACTORY_ISO_FIXED_DIR}" || exit; curl -LOR "${ISO_URL_BASE}/${version_major}/isos/${arch}/${latest_iso}") + case ${flavor} in universal) # universal will boot with DVD ISO but perform a network install from LOCATION diff --git a/scripts/post_cloud_factory.sh b/scripts/post_cloud_factory.sh index 6fd97b7f..43454f16 100644 --- a/scripts/post_cloud_factory.sh +++ b/scripts/post_cloud_factory.sh @@ -33,6 +33,7 @@ do latest_image=$(get_latest_image "${version_major}" "${arch}" "${image_class}") test -f "${FACTORY_HDD_FIXED_DIR}/${latest_image}" || \ (cd "${FACTORY_HDD_FIXED_DIR}" || exit; curl -LOR "${IMAGE_URL_BASE}/${version_major}/images/${arch}/${latest_image}") + flavor=$(printf "%s\n" "${image_class}" | tr '-' '_') openqa-cli api -X POST isos \ HDD_2="${latest_image}" \ diff --git a/scripts/post_minimal_factory.sh b/scripts/post_minimal_factory.sh index 2e9dc15d..dbe29acb 100644 --- a/scripts/post_minimal_factory.sh +++ b/scripts/post_minimal_factory.sh @@ -32,7 +32,7 @@ do latest_iso=$(get_latest_iso "${version}" "${arch}" "${flavor}") test -f "${FACTORY_ISO_FIXED_DIR}/${latest_iso}" || \ (cd "${FACTORY_ISO_FIXED_DIR}" || exit; curl -LOR "${ISO_URL_BASE}/${version_major}/isos/${arch}/${latest_iso}") - + if [ "${version_major}" == "8" ]; then openqa-cli api -X POST isos \ ISO="${latest_iso}" \