Merge pull request #5940 from ggiguash/remove-upstream-scenarios-421

[release-4.21] USHIFT-6384: Remove upstream scenarios and blueprints

Author: openshift-merge-bot[bot]

test/bin/ci_phase_iso_build.sh

@@ -119,17 +119,13 @@ run_bootc_image_build() {
         if [[ "${CI_JOB_NAME}" =~ .*periodic.* ]]; then
             $(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
-        fi
         if [[ "${CI_JOB_NAME}" =~ .*release.* ]]; then
             $(dry_run) bash -x ./bin/build_bootc_images.sh -l ./image-blueprints-bootc/layer5-release
         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
     fi
 }

test/image-blueprints-bootc/README.md

@@ -40,14 +40,3 @@ Artifacts built in this layer cannot be cached as they depend on the current sou
 |group2| Average  | Current source artifacts on RHEL used only in periodics
 
 > Note: Total build times are up to 15 minutes.
-
-## Bootc Upstream 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 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.