Remove P8 and P9 hack so tests pass for Power10

008e04c and a6d7bbb added and used the libguestfs-ppc64le-wrapper.sh in order to address some failing tests on ppc64le. Using a Power10 machine with KVM enabled, tests are passing with this script removed. There was a successful test run with: cosa kola run --tag '!reprovision'

Signed-off-by: Mick Tarsel <[email protected]>

mantle/platform/qemu.go

@@ -51,8 +51,6 @@ import (
 	"github.com/coreos/coreos-assembler/mantle/system"
 	"github.com/coreos/coreos-assembler/mantle/system/exec"
 	"github.com/pkg/errors"
-
-	"golang.org/x/sys/unix"
 )
 
 var (
@@ -859,19 +857,6 @@ func newGuestfish(arch, diskImagePath string, diskSectorSize int) (*coreosGuestf
 	cmd := exec.Command("guestfish", guestfishArgs...)
 	cmd.Env = append(os.Environ(), "LIBGUESTFS_BACKEND=direct")
 
-	// Hack to run with a wrapper on older P8 hardware running RHEL7
-	switch arch {
-	case "ppc64le":
-		u := unix.Utsname{}
-		if err := unix.Uname(&u); err != nil {
-			return nil, errors.Wrapf(err, "detecting kernel information")
-		}
-		if strings.Contains(fmt.Sprintf("%s", u.Release), "el7") {
-			plog.Infof("Detected el7. Running using libguestfs-ppc64le-wrapper.sh")
-			cmd.Env = append(cmd.Env, "LIBGUESTFS_HV=/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh")
-		}
-	}
-
 	// make sure it inherits stderr so we see any error message
 	cmd.Stderr = os.Stderr
 	stdout, err := cmd.StdoutPipe()

src/libguestfish.sh

@@ -11,14 +11,6 @@ export LIBGUESTFS_BACKEND=direct
 
 arch=$(uname -m)
 
-
-# Hack to run with a wrapper on older P8 hardware running RHEL7
-if [ "$arch" = "ppc64le" ] ; then
-    if [[ "$(uname -r)" =~ "el7" ]]; then
-        export LIBGUESTFS_HV="/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh"
-    fi
-fi
-
 # Hack to give ppc64le more memory inside the libguestfs VM.
 # The compiled in default I see when running `guestfish get-memsize`
 # is 1280. We need this because we are seeing issues from