USHIFT-6515: Auto set lrel version and simplify lrel container/toml files

test/assets/common_versions.sh.template

@@ -155,11 +155,23 @@ export BREW_RC_RELEASE_VERSION
 export BREW_EC_RELEASE_VERSION
 export BREW_NIGHTLY_RELEASE_VERSION
 
-# Set the release type to ec, rc or zstream
-LATEST_RELEASE_TYPE="{LATEST_RELEASE_TYPE}"
+# Set the release type based on priority: zstream > RC > EC
+# When a zstream release exists, it supersedes RC and EC.
+# When an RC exists, it supersedes EC.
+if [ -n "${{BREW_Y0_RELEASE_VERSION}}" ]; then
+    LATEST_RELEASE_TYPE="zstream"
+    BREW_LREL_RELEASE_VERSION="${{BREW_Y0_RELEASE_VERSION}}"
+elif [ -n "${{BREW_RC_RELEASE_VERSION}}" ]; then
+    LATEST_RELEASE_TYPE="rc"
+    BREW_LREL_RELEASE_VERSION="${{BREW_RC_RELEASE_VERSION}}"
+elif [ -n "${{BREW_EC_RELEASE_VERSION}}" ]; then
+    LATEST_RELEASE_TYPE="ec"
+    BREW_LREL_RELEASE_VERSION="${{BREW_EC_RELEASE_VERSION}}"
+else
+    LATEST_RELEASE_TYPE=""
+    BREW_LREL_RELEASE_VERSION=""
+fi
 export LATEST_RELEASE_TYPE
-
-BREW_LREL_RELEASE_VERSION="${{BREW_EC_RELEASE_VERSION}}"
 export BREW_LREL_RELEASE_VERSION
 
 # Branch and commit for the openshift-tests-private repository

test/bin/common_versions.sh

@@ -155,11 +155,23 @@ export BREW_RC_RELEASE_VERSION
 export BREW_EC_RELEASE_VERSION
 export BREW_NIGHTLY_RELEASE_VERSION
 
-# Set the release type to ec, rc or zstream
-LATEST_RELEASE_TYPE="ec"
+# Set the release type based on priority: zstream > RC > EC
+# When a zstream release exists, it supersedes RC and EC.
+# When an RC exists, it supersedes EC.
+if [ -n "${BREW_Y0_RELEASE_VERSION}" ]; then
+    LATEST_RELEASE_TYPE="zstream"
+    BREW_LREL_RELEASE_VERSION="${BREW_Y0_RELEASE_VERSION}"
+elif [ -n "${BREW_RC_RELEASE_VERSION}" ]; then
+    LATEST_RELEASE_TYPE="rc"
+    BREW_LREL_RELEASE_VERSION="${BREW_RC_RELEASE_VERSION}"
+elif [ -n "${BREW_EC_RELEASE_VERSION}" ]; then
+    LATEST_RELEASE_TYPE="ec"
+    BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}"
+else
+    LATEST_RELEASE_TYPE=""
+    BREW_LREL_RELEASE_VERSION=""
+fi
 export LATEST_RELEASE_TYPE
-
-BREW_LREL_RELEASE_VERSION="${BREW_EC_RELEASE_VERSION}"
 export BREW_LREL_RELEASE_VERSION
 
 # Branch and commit for the openshift-tests-private repository

test/bin/manage_build_cache.sh

@@ -8,6 +8,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${SCRIPTDIR}/common.sh"
 
 AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
+AWS_BUCKET_NAME="microshift-build-ushift-6515-cache-us-west-2"
 BCH_SUBDIR=
 TAG_SUBDIR=
 ARCH_SUBDIR="${UNAME_M}"

test/bin/pyutils/generate_common_versions.py

@@ -27,8 +27,6 @@
 # The current version of the microshift-gitops package.
 GITOPS_VERSION = "1.16"
 
-# Set the release type to ec, rc or zstream
-LATEST_RELEASE_TYPE = "ec"
 
 logging.basicConfig(
     level=logging.INFO,
@@ -279,7 +277,6 @@ def generate_common_versions(minor_version):
         CNCF_SONOBUOY_VERSION=CNCF_SONOBUOY_VERSION,
         CNCF_SYSTEMD_LOGS_VERSION=CNCF_SYSTEMD_LOGS_VERSION,
         GITOPS_VERSION=GITOPS_VERSION,
-        LATEST_RELEASE_TYPE=LATEST_RELEASE_TYPE,
         ARCH=ARCH
     )
 

test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-ec-with-optional.containerfile → test/image-blueprints-bootc/layer5-release/group1/rhel100-bootc-brew-lrel-optional.containerfile

@@ -1,4 +1,4 @@
-# {{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}}
+# {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
 # Note: This comment makes templating add a new line before the code
 FROM localhost/rhel100-test-agent:latest
 
@@ -21,14 +21,14 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-da
 RUN dnf repoinfo --enabled && \
     dnf install -y firewalld systemd-resolved openssl \
         {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_EC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ range (env.Getenv "MICROSHIFT_OPTIONAL_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_EC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
         {{ range (env.Getenv "MICROSHIFT_X86_64_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_EC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ end -}}
         && \

test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-rc-with-optional.containerfile → test/image-blueprints-bootc/layer5-release/group1/rhel96-bootc-brew-lrel-optional.containerfile

@@ -1,4 +1,4 @@
-# {{- if env.Getenv "BREW_RC_RELEASE_VERSION" "" -}}
+# {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
 # Note: This comment makes templating add a new line before the code
 FROM localhost/rhel96-test-agent:latest
 
@@ -18,14 +18,14 @@ COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-fast-da
 RUN dnf repoinfo --enabled && \
     dnf install -y firewalld systemd-resolved \
         {{ range (env.Getenv "MICROSHIFT_MANDATORY_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_RC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ range (env.Getenv "MICROSHIFT_OPTIONAL_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_RC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) -}}
         {{ range (env.Getenv "MICROSHIFT_X86_64_RPMS" | strings.Split " ") -}}
-        "{{ . }}-{{ env.Getenv "BREW_RC_RELEASE_VERSION" }}" \
+        "{{ . }}-{{ env.Getenv "BREW_LREL_RELEASE_VERSION" }}" \
         {{ end -}}
         {{ end -}}
         && \

test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-ec-with-optional-fips.containerfile → test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-fips.containerfile

@@ -1,6 +1,6 @@
-# {{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}}
+# {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
 # Note: This comment makes templating add a new line before the code
-FROM localhost/rhel96-bootc-brew-ec-with-optional:latest
+FROM localhost/rhel96-bootc-brew-lrel-optional:latest
 
 # Add fips=1 kernel argument
 # See https://containers.github.io/bootc/building/kernel-arguments.html

test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-optional.image-bootc

@@ -0,0 +1,3 @@
+{{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
+localhost/rhel96-bootc-brew-lrel-optional:latest
+{{- end }}

test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-ec-with-optional-tuned.containerfile → test/image-blueprints-bootc/layer5-release/group2/rhel96-bootc-brew-lrel-tuned.containerfile

@@ -1,10 +1,6 @@
-# {{- if env.Getenv "BREW_EC_RELEASE_VERSION" "" -}}
+# {{- if env.Getenv "BREW_LREL_RELEASE_VERSION" "" -}}
 # Note: This comment makes templating add a new line before the code
-FROM localhost/rhel96-bootc-brew-ec-with-optional:latest
-
-# Install low-latency packages
-RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \
-    dnf clean all
+FROM localhost/rhel96-bootc-brew-lrel-optional:latest
 
 # Enable microshift-tuned service
 RUN systemctl enable microshift-tuned