Skip to content

Commit

Permalink
Fix elemental-iso-add-registration script
Browse files Browse the repository at this point in the history
The build image is not needed anymore and the default ISO for Dev has
been changed.

Signed-off-by: Loic Devulder <ldevulder@suse.com>
  • Loading branch information
ldevulder committed Aug 18, 2023
1 parent de8a996 commit 07f6180
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/elemental-iso-add-registration
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,11 @@ iso_repack() {
# Docker repos only in lowercase
REPOINLOWER=$(echo $REPO | tr '[:upper:]' '[:lower:]')


# This image needs to have xorriso >= 5
if [ ${REPO} == "Stable" ]; then
: ${BUILD_IMG:=registry.opensuse.org/isv/rancher/elemental/${REPOINLOWER}/teal53/15.4/rancher/elemental-builder-image/5.3:latest}
else
: ${BUILD_IMG:=registry.opensuse.org/isv/rancher/elemental/${REPOINLOWER}/containers/rancher/elemental-builder-image/5.4:latest}
: ${BUILD_IMG:=registry.opensuse.org/isv/rancher/elemental/${REPOINLOWER}/containers/rancher/elemental-teal/5.4:latest}
fi

REG_CONFIG_FILE=${1:-}
Expand All @@ -99,7 +98,11 @@ if [ "$ARCH" == "amd64" ]; then
ARCH="x86_64"
fi

ISO_URL=${2:-https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/${REPO}:/Teal53/media/iso/elemental-teal.${ARCH}.iso}
if [ ${REPO} == "Stable" ]; then
ISO_URL=${2:-https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/${REPO}:/Teal53/media/iso/elemental-teal.${ARCH}.iso}
else
ISO_URL=${2:-https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/${REPO}/containers/iso/elemental-teal.${ARCH}.iso}
fi

[ "${REPO}" == "Dev" ] || [ "${REPO}" == "Staging" ] || [ "${REPO}" == "Stable" ] || abort "REPO=${REPO} variable has to match Dev|Staging|Stable, aborting"
[ -n "${REG_CONFIG_FILE}" ] || abort "No registration configuration file provided, aborting"
Expand Down

0 comments on commit 07f6180

Please sign in to comment.