USHIFT-6544: Interchange release and upstream layers in image-blueprints-bootc

test/bin/ci_phase_iso_build.sh

@@ -68,7 +68,7 @@ update_build_cache() {
     $(dry_run) bash -x ./bin/build_images.sh -l ./image-blueprints/layer4-release
     # Build the bootc base layer and brew RPMs to be cached
     $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
-    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-release
+    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-release
 
     # Prepare for the cache upload by stopping composer services and cleaning
     # temporary artifacts
@@ -129,14 +129,14 @@ run_bootc_image_build() {
             $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer3-periodic
         fi
         if [[ "${CI_JOB_NAME}" =~ .*upstream.* ]]; then
-            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-upstream
+            $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-upstream
         fi
     else
         $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
         $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer2-presubmit
         $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer3-periodic
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-upstream
-        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-release
+        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-upstream
+        $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer4-release
     fi
 }
 

test/image-blueprints-bootc/README.md

@@ -41,24 +41,24 @@ Artifacts built in this layer cannot be cached as they depend on the current sou
 
 > Note: Total build times are up to 15 minutes.
 
-## Bootc Upstream Layer
+## Bootc Release Layer
 
-Artifacts built in this layer cannot be cached as they depend on the current sources.
+Artifacts built in this layer are cached as they depend on Brew RPM packages available only behind the VPN.
 
 |Group |Build Time|Description|
 |------|----------|-----------|
-|group1| Average  | Current source prerequisites on CentOS used only in upstream
-|group2| Average  | Current source artifacts on CentOS used only in upstream
+|group1| Average  | Bootc images from for release testing (EC, RC, z-stream, y-1, y-2) including all microshift RPMs.
+|group2| Average  | Bootc images from previous group plus special config (FIPS, tuned) and image installers.
 
 > Note: Total build times are up to 15 minutes.
 
-## Bootc Release Layer
+## Bootc Upstream Layer
 
-Artifacts built in this layer are cached as they depend on Brew RPM packages available only behind the VPN.
+Artifacts built in this layer cannot be cached as they depend on the current sources.
 
 |Group |Build Time|Description|
 |------|----------|-----------|
-|group1| Average  | Bootc images from for release testing (EC, RC, z-stream, y-1, y-2) including all microshift RPMs.
-|group2| Average  | Bootc images from previous group plus special config (FIPS, tuned) and image installers.
+|group1| Average  | Current source prerequisites on CentOS used only in upstream
+|group2| Average  | Current source artifacts on CentOS used only in upstream
 
 > Note: Total build times are up to 15 minutes.