fix(ibmcloud): harden Power VS provisioning and address PR review

Author: deekay2310

cmd/mapt/cmd/params/params.go

@@ -321,6 +321,11 @@ func GithubRunnerArgs() *github.GithubRunnerArgs {
 			logging.Errorf("invalid --ghactions-runner-image-repo: %v", err)
 			return nil
 		}
+		if imageRepo != ghActionsRunnerImageRepoDefault {
+			logging.Infof("using custom runner image repo: %s", imageRepo)
+		} else {
+			logging.Debugf("using temporary fork %s; will switch to IBM upstream once RHEL script is merged", imageRepo)
+		}
 	}
 	return &github.GithubRunnerArgs{
 		Token:           token,

pkg/provider/ibmcloud/action/ibm-power/cloud-config

@@ -11,25 +11,33 @@ write_files:
         mkdir -p /home/containers/storage
       else
         DATA_DEV=""
-        while true; do
+        ATTEMPTS=0
+        MAX_ATTEMPTS=90
+        while [ $ATTEMPTS -lt $MAX_ATTEMPTS ]; do
           DATA_DEV=$(lsblk -rnpo NAME,TYPE | awk '$2=="mpath"{mpath[$1]=1} $2=="part"{p=$1; sub(/p?[0-9]+$/,"",p); has_part[p]=1} END{for(d in mpath) if(!has_part[d]&&d!~/control/) print d}' | head -1)
           [ -n "$DATA_DEV" ] && break
           udevadm trigger --subsystem-match=block 2>/dev/null || true
           udevadm settle 2>/dev/null || true
           multipathd reconfigure 2>/dev/null || true
+          ATTEMPTS=$((ATTEMPTS + 1))
           sleep 10
         done
-        udevadm settle 2>/dev/null || true
-        sleep 10
-        mkfs.xfs -f -K "$DATA_DEV"
-        UUID=$(blkid -s UUID -o value "$DATA_DEV")
-        mkdir -p /mnt/home-tmp
-        cp -a /home/. /mnt/home-tmp/
-        mount "$DATA_DEV" /home
-        cp -a /mnt/home-tmp/. /home/
-        rm -rf /mnt/home-tmp
-        echo "UUID=$UUID /home xfs defaults 0 2" >> /etc/fstab
-        mkdir -p /home/containers/storage
+        if [ -z "$DATA_DEV" ]; then
+          echo "WARNING: data volume not found after $((MAX_ATTEMPTS * 10))s, using root filesystem" >&2
+          mkdir -p /home/containers/storage
+        else
+          udevadm settle 2>/dev/null || true
+          sleep 10
+          mkfs.xfs -f -K "$DATA_DEV"
+          UUID=$(blkid -s UUID -o value "$DATA_DEV")
+          mkdir -p /mnt/home-tmp
+          cp -a /home/. /mnt/home-tmp/
+          mount "$DATA_DEV" /home
+          cp -a /mnt/home-tmp/. /home/
+          rm -rf /mnt/home-tmp
+          echo "UUID=$UUID /home xfs defaults 0 2" >> /etc/fstab
+          mkdir -p /home/containers/storage
+        fi
       fi
       if ! mountpoint -q /var/lib/containers/storage; then
         mount --bind /home/containers/storage /var/lib/containers/storage

pkg/provider/ibmcloud/action/ibm-power/ibm-power.go

@@ -180,7 +180,7 @@ func New(ctx *mc.ContextArgs, args *PWArgs) error {
 		if i < len(sysTypes.Types)-1 {
 			logging.Infof("destroying partial stack before retry...")
 			if dErr := destroyForRetry(mCtx); dErr != nil {
-				logging.Warnf("failed to destroy partial stack: %v", dErr)
+				return fmt.Errorf("failed to destroy partial stack before retry: %w", dErr)
 			}
 		}
 	}

pkg/provider/ibmcloud/data/pisystemtypes.go

@@ -14,7 +14,7 @@ import (
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 )
 
-var DefaultSystemTypePriority = []string{"s1022", "s1122", "e1080", "e1050", "e980", "s922"}
+var DefaultSystemTypePriority = []string{"e1080", "e1050", "s1122", "s1022", "e980", "s922"}
 
 type SystemTypeRequirements struct {
 	CloudInstanceId string
@@ -71,6 +71,12 @@ func filterAndPrioritize(preferred, procType string, general, dedicated []string
 		}
 	}
 
+	for _, t := range supported {
+		if !slices.Contains(filtered, t) {
+			filtered = append(filtered, t)
+		}
+	}
+
 	if len(filtered) == 0 {
 		return nil, fmt.Errorf(
 			"no system types from priority list %v are supported in zone (supported: %v)",