USHIFT-4742: Bootc and ostree blueprint structure reorganization

test/bin/ci_phase_iso_build.sh

@@ -65,9 +65,8 @@ update_build_cache() {
 
     # Build the composer-cli base layer to be cached
     $(dry_run) bash -x ./bin/build_images.sh -l ./image-blueprints/layer1-base
-    # Build the bootc base groups to be cached
-    $(dry_run) bash -x ./bin/build_bootc_images.sh -g ./image-blueprints/layer5-bootc/group0
-    $(dry_run) bash -x ./bin/build_bootc_images.sh -g ./image-blueprints/layer5-bootc/group1
+    # Build the bootc base layer to be cached
+    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer1-base
 
     # Upload the images and update the 'last' setting
     ./bin/manage_build_cache.sh upload  -b "${SCENARIO_BUILD_BRANCH}" -t "${SCENARIO_BUILD_TAG}"
@@ -102,7 +101,8 @@ run_image_build() {
 
 # Run bootc image build
 run_bootc_image_build() {
-    $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints/layer5-bootc
+    $(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-source
 }
 
 cat /etc/os-release

test/image-blueprints-bootc/README.md

@@ -0,0 +1,32 @@
+The following guiding principles should be used when adding more artifacts to
+each layer or group under `test/image-blueprints-bootc` directory.
+
+> Important: Keep balanced build times within each group and maximize caching
+> of artifacts independent of the current source code.
+
+## Bootc Base Layer
+
+Artifacts built in this layer are cached.
+
+|Group |Build Time|Description|
+|------|----------|-----------|
+|group1| Short    | Basic prerequisites
+|group2| Long     | Artifacts independent of current sources
+
+> Note: Total build times are up to 15 minutes.
+
+## Bootc Source Layer
+
+Artifacts built in this layer cannot be cached as they depend on the current sources.
+
+|Group |Build Time|Description|
+|------|----------|-----------|
+|group1| Average  | Current source prerequisites (RHEL and CentOS)
+|group2| Average  | Current source artifacts on RHEL
+|group3| Average  | Current source artifacts on CentOS (with 1 exception)
+
+> Note:
+> * Total build times are up to 15 minutes.
+> * The `rhel94-bootc-source-isolated.image-bootc` file is an exception in
+>   `group3` as it uses RHEL. This is done not to create a group with a single
+>   file.

test/image-blueprints-bootc/layer1-base/group2/rhel94-bootc-crel-optionals.containerfile

@@ -0,0 +1,31 @@
+FROM localhost/rhel94-test-agent:latest
+
+# Copy repository configuration
+COPY ./bootc-images/microshift-fast-datapath-rhel9.repo ./bootc-images/microshift-crel.repo ./bootc-images/microshift-rhocp-y.repo \
+    /etc/yum.repos.d/
+
+# Print repository configuration contents.
+# Install MicroShift with optional components and cleanup.
+RUN dnf repoinfo --enabled && \
+    dnf install -y firewalld \
+        "microshift-{{ .Env.CURRENT_RELEASE_VERSION }}" "microshift-release-info-{{ .Env.CURRENT_RELEASE_VERSION }}" \
+        "microshift-olm-{{ .Env.CURRENT_RELEASE_VERSION }}" "microshift-multus-{{ .Env.CURRENT_RELEASE_VERSION }}"  && \
+    systemctl enable microshift && \
+    rm -vf /etc/yum.repos.d/microshift-*.repo && \
+    dnf clean all
+
+# Extend Greenboot wait timeout to 10m for MicroShift to be ready.
+# Greenboot configuration must come after RPM install to avoid
+# /etc/greenboot/greenboot.conf overwrite by the package update.
+RUN printf "\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n" >> /etc/greenboot/greenboot.conf
+
+# Configure firewall
+RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
+    firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \
+    firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \
+    firewall-offline-cmd --zone=public --add-port=80/tcp && \
+    firewall-offline-cmd --zone=public --add-port=443/tcp && \
+    firewall-offline-cmd --zone=public --add-port=5353/udp && \
+    firewall-offline-cmd --zone=public --add-port=6443/tcp && \
+    firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
+    firewall-offline-cmd --zone=public --add-port=30000-32767/udp

test/image-blueprints/README.md

@@ -0,0 +1,44 @@
+The following guiding principles should be used when adding more artifacts to
+each layer or group under `test/image-blueprints` directory.
+
+> Important: Keep balanced build times within each group and maximize caching
+> of artifacts independent of the current source code.
+
+## OSTree Base Layer
+
+Artifacts built in this layer are cached.
+
+Groups 1-to-3 enforce an ordered build chain, necessary to satisfy a mandatory
+layer dependency of `rhel94 os-only -> rhel94 y-2 -> rhel94 y-1`, which is needed
+for testing upgrades.
+
+|Group |Build Time|Description|
+|------|----------|-----------|
+|group1| Short    | RHEL 9.4 OS-only base layer
+|group2| Short    | RHEL 9.4 layer with MicroShift `y-2` packages
+|group3| Short    | RHEL 9.4 layer with MicroShift `y-1` packages
+|group4| Average  | Other artifacts independent of current sources
+
+> Note: Total build times are up to 30 minutes.
+
+## OSTree Presubmit Layer
+
+Artifacts built in this layer cannot be cached as they depend on the current sources.
+The artifacts are used by pre-submit and periodic CI jobs.
+
+|Group |Build Time|Description|
+|------|----------|-----------|
+|group1| Average  | Current source prerequisites used in pre-submits and periodics
+
+> Note: Total build times are up to 10 minutes.
+
+## OSTree Periodic Layer
+
+Artifacts built in this layer cannot be cached as they depend on the current sources.
+The artifacts are only used by periodic CI jobs.
+
+|Group |Build Time|Description|
+|------|----------|-----------|
+|group1| Average  | Current source prerequisites used only in periodics
+
+> Note: Total build times are up to 15 minutes.