tests: address CodeRabbit review comments from downstream PR

- Rename local variable `tag` to `bundleTag` in catalog.Build to avoid
  shadowing the method's `tag` parameter
- Log and skip (instead of silently dropping) invalid LargeCRD field
  counts in the bundle option parser
- Look up channels by name in TestCatalog_FBCGeneration instead of
  assuming insertion order
- Add a semaphore (8 slots) to ScenarioCleanup deletion loop to bound
  concurrent kubectl calls
- Clarify README that ClusterObjectSet deletion is conditional on the
  BoxcutterRuntime feature gate
- Add missing `text` language specifier to fenced code block in
  e2e-isolation design doc
- Remove extra blank line in setup.sh

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Todd Short <tshort@redhat.com>

Author: tmshort

docs/designs/testing/2026-04-13-e2e-isolation/design.md

@@ -12,7 +12,7 @@ Each scenario dynamically builds and pushes its own bundle and catalog OCI image
 parameterized by scenario ID. All cluster-scoped resource names include the scenario ID, making
 conflicts structurally impossible.
 
-```
+```text
 Scenario starts
   -> Generate parameterized bundle manifests (CRD names, deployments, etc. include scenario ID)
   -> Build + push bundle OCI images to e2e registry via go-containerregistry

test/e2e/README.md

@@ -292,7 +292,7 @@ Each scenario runs in its own namespace with unique resource names, ensuring com
 
 The `ScenarioCleanup` hook ensures all resources are deleted after each scenario:
 
-- Deletes ClusterExtensions and ClusterObjectSets
+- Deletes ClusterExtensions and (when BoxcutterRuntime gate is enabled) ClusterObjectSets
 - Deletes ClusterCatalogs
 - Deletes namespaces
 - Deletes added resources

test/e2e/steps/hooks.go

@@ -222,11 +222,15 @@ func ScenarioCleanup(ctx context.Context, _ *godog.Scenario, err error) (context
 	}
 	forDeletion = append(forDeletion, resource{name: sc.namespace, kind: "namespace"})
 
+	const maxConcurrentDeletes = 8
+	sem := make(chan struct{}, maxConcurrentDeletes)
 	var wg sync.WaitGroup
 	for _, r := range forDeletion {
 		wg.Add(1)
 		go func(res resource) {
 			defer wg.Done()
+			sem <- struct{}{}
+			defer func() { <-sem }()
 			args := []string{"delete", res.kind, res.name, "--ignore-not-found=true"}
 			if res.namespace != "" {
 				args = append(args, "-n", res.namespace)

test/e2e/steps/steps.go

@@ -1683,9 +1683,11 @@ func parseContents(contents string) []catalog.BundleOption {
 			// LargeCRD(250)
 			countStr := part[len("LargeCRD(") : len(part)-1]
 			count, err := strconv.Atoi(countStr)
-			if err == nil {
-				opts = append(opts, catalog.WithLargeCRD(count))
+			if err != nil {
+				logger.V(1).Info("ignoring invalid LargeCRD field count", "value", countStr, "error", err)
+				continue
 			}
+			opts = append(opts, catalog.WithLargeCRD(count))
 		case strings.HasPrefix(part, "ClusterRegistry(") && strings.HasSuffix(part, ")"):
 			// ClusterRegistry(mirrored-registry.operator-controller-e2e.svc.cluster.local:5000)
 			host := part[len("ClusterRegistry(") : len(part)-1]

test/extension-developer-e2e/setup.sh

@@ -92,7 +92,6 @@ reg_bundle_img="${cluster_registry_host}/bundles/registry-v1/registry-bundle:v0.
 # because docker push goes through the Docker daemon which
 # may be in a different network context (e.g. colima VM).
 
-
 ###############################
 # Create the FBC that contains
 # the registry+v1 extensions

test/internal/catalog/catalog.go

@@ -154,9 +154,9 @@ func (c *Catalog) Build(ctx context.Context, tag, localRegistry, clusterRegistry
 				return nil, fmt.Errorf("failed to set bundle labels for %s:%s: %w", paramPkgName, bd.version, err)
 			}
 
-			tag := fmt.Sprintf("%s/bundles/%s:v%s", localRegistry, paramPkgName, bd.version)
-			if err := crane.Push(img, tag, crane.Insecure, crane.WithContext(ctx)); err != nil {
-				return nil, fmt.Errorf("failed to push bundle image %s: %w", tag, err)
+			bundleTag := fmt.Sprintf("%s/bundles/%s:v%s", localRegistry, paramPkgName, bd.version)
+			if err := crane.Push(img, bundleTag, crane.Insecure, crane.WithContext(ctx)); err != nil {
+				return nil, fmt.Errorf("failed to push bundle image %s: %w", bundleTag, err)
 			}
 			bundleClusterRegistry := clusterRegistry
 			if spec.clusterRegistryOverride != "" {

test/internal/catalog/catalog_test.go

@@ -134,17 +134,29 @@ func TestCatalog_FBCGeneration(t *testing.T) {
 		t.Errorf("expected 2 channels, got %d", len(pkg.channels))
 	}
 
-	// Verify alpha channel has 1 entry
-	alpha := pkg.channels[0]
-	if alpha.name != "alpha" {
-		t.Errorf("expected channel 'alpha', got %q", alpha.name)
+	// Verify channels by name rather than by index so the test is robust to ordering changes.
+	var alpha, beta *channelDef
+	for i := range pkg.channels {
+		switch pkg.channels[i].name {
+		case "alpha":
+			alpha = &pkg.channels[i]
+		case "beta":
+			beta = &pkg.channels[i]
+		}
+	}
+	if alpha == nil {
+		t.Fatal("alpha channel not found")
+	}
+	if beta == nil {
+		t.Fatal("beta channel not found")
 	}
+
+	// Verify alpha channel has 1 entry
 	if len(alpha.entries) != 1 {
 		t.Errorf("expected 1 alpha entry, got %d", len(alpha.entries))
 	}
 
 	// Verify beta channel has replaces edge
-	beta := pkg.channels[1]
 	if len(beta.entries) != 2 {
 		t.Fatalf("expected 2 beta entries, got %d", len(beta.entries))
 	}