update e2e-deployment for 0-rc to match structure before bootstrap alignment (#281)

Author: maorfr

.github/workflows/e2e-deployment-rc.yml

@@ -128,82 +128,82 @@ jobs:
           make -f Makefile.ci install-enclave
           echo "Enclave Lab installed" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Setup environment
-        id: bootstrap_setup
+      - name: Phase 1 - Prepare binaries and content
+        id: deploy_prepare
         run: |
-          echo "## Bootstrap: Setup" >> $GITHUB_STEP_SUMMARY
-          make -f Makefile.ci deploy-cluster-setup
-          echo "Setup complete" >> $GITHUB_STEP_SUMMARY
-
-      - name: Bootstrap - Validate configuration
-        id: bootstrap_validate
-        run: |
-          echo "## Bootstrap: Validate" >> $GITHUB_STEP_SUMMARY
-          make -f Makefile.ci deploy-cluster-validate
-          echo "Validation complete" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 1: Prepare" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Downloading OpenShift binaries and content..." >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Download content
-        id: bootstrap_download_content
-        run: |
-          echo "## Bootstrap: Download Content" >> $GITHUB_STEP_SUMMARY
           make -f Makefile.ci deploy-cluster-prepare
-          echo "Download complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Build local cache
-        id: bootstrap_build_cache
+          echo "Phase 1 complete" >> $GITHUB_STEP_SUMMARY
+
+      - name: Phase 2 - Mirror registry setup
+        id: deploy_mirror
         run: |
-          echo "## Bootstrap: Build Cache" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 2: Mirror Registry" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Setting up local mirror registry (disconnected mode)..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-mirror
-          echo "Cache build complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Acquire hardware
-        id: bootstrap_acquire_hardware
-        run: |
-          echo "## Bootstrap: Acquire Hardware" >> $GITHUB_STEP_SUMMARY
-          make -f Makefile.ci deploy-cluster-acquire-hardware
-          echo "Hardware acquired" >> $GITHUB_STEP_SUMMARY
+          echo "Phase 2 complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Deploy cluster
-        id: bootstrap_deploy
+      - name: Phase 3 - Deploy OpenShift cluster
+        id: deploy_install
         run: |
-          echo "## Bootstrap: Deploy Cluster" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 3: Deploy Cluster" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Deploying OpenShift cluster (mode: disconnected)..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-install
-          echo "Cluster deployed" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Post-install
-        id: bootstrap_post_install
+          echo "Phase 3 complete - Cluster deployed" >> $GITHUB_STEP_SUMMARY
+
+      - name: Phase 4 - Post-install configuration
+        id: deploy_post_install
         run: |
-          echo "## Bootstrap: Post-Install" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 4: Post-Install Configuration" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Configuring cluster (secrets, certificates, API health)..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-post-install
-          echo "Post-install complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Trust custom CA certificate
-        id: trust_custom_ca
-        run: |
-          echo "## Trust Custom CA" >> $GITHUB_STEP_SUMMARY
-          make -f Makefile.ci trust-custom-ca
-          echo "Custom CA trusted" >> $GITHUB_STEP_SUMMARY
+          echo "Phase 4 complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Operators
-        id: bootstrap_operators
+      - name: Phase 5 - Install operators
+        id: deploy_operators
         run: |
-          echo "## Bootstrap: Operators" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 5: Operators" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Installing and configuring operators..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-operators
-          echo "Operators installed" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Day-2
-        id: bootstrap_day2
+          echo "Phase 5 complete" >> $GITHUB_STEP_SUMMARY
+
+      - name: Phase 6 - Day-2 operations
+        id: deploy_day2
         run: |
-          echo "## Bootstrap: Day-2" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 6: Day-2 Operations" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Configuring advanced features and policies..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-day2
-          echo "Day-2 complete" >> $GITHUB_STEP_SUMMARY
 
-      - name: Bootstrap - Discovery
-        id: bootstrap_discovery
+          echo "Phase 6 complete" >> $GITHUB_STEP_SUMMARY
+
+      - name: Phase 7 - Configure hardware discovery
+        id: deploy_discovery
         run: |
-          echo "## Bootstrap: Discovery" >> $GITHUB_STEP_SUMMARY
+          echo "## Phase 7: Hardware Discovery" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Configuring hardware discovery infrastructure..." >> $GITHUB_STEP_SUMMARY
+
           make -f Makefile.ci deploy-cluster-discovery
-          echo "Discovery complete" >> $GITHUB_STEP_SUMMARY
+
+          echo "Phase 7 complete - Full deployment complete" >> $GITHUB_STEP_SUMMARY
 
       - name: Verify cluster deployment
         if: success()
@@ -379,32 +379,24 @@ jobs:
           STEPS_JSON: ${{ toJSON(steps) }}
         run: |
           declare -A step_names=(
-            ["bootstrap_setup"]="Bootstrap: Setup environment"
-            ["bootstrap_validate"]="Bootstrap: Validate configuration"
-            ["bootstrap_download_content"]="Bootstrap: Download content"
-            ["bootstrap_build_cache"]="Bootstrap: Build local cache"
-            ["bootstrap_acquire_hardware"]="Bootstrap: Acquire hardware"
-            ["bootstrap_deploy"]="Bootstrap: Deploy cluster"
-            ["bootstrap_post_install"]="Bootstrap: Post-install"
-            ["trust_custom_ca"]="Trust custom CA certificate"
-            ["bootstrap_operators"]="Bootstrap: Operators"
-            ["bootstrap_day2"]="Bootstrap: Day-2"
-            ["bootstrap_discovery"]="Bootstrap: Discovery"
+            ["deploy_prepare"]="Phase 1: Prepare binaries and content"
+            ["deploy_mirror"]="Phase 2: Setup mirror registry"
+            ["deploy_install"]="Phase 3: Deploy OpenShift cluster"
+            ["deploy_post_install"]="Phase 4: Post-install configuration"
+            ["deploy_operators"]="Phase 5: Install operators"
+            ["deploy_day2"]="Phase 6: Day-2 operations"
+            ["deploy_discovery"]="Phase 7: Configure hardware discovery"
             ["verify_cluster"]="Verify cluster deployment"
           )
 
           step_order=(
-            bootstrap_setup
-            bootstrap_validate
-            bootstrap_download_content
-            bootstrap_build_cache
-            bootstrap_acquire_hardware
-            bootstrap_deploy
-            bootstrap_post_install
-            trust_custom_ca
-            bootstrap_operators
-            bootstrap_day2
-            bootstrap_discovery
+            deploy_prepare
+            deploy_mirror
+            deploy_install
+            deploy_post_install
+            deploy_operators
+            deploy_day2
+            deploy_discovery
             verify_cluster
           )