From 4a8fc18c83aece63d658681e9d60d9cae1708639 Mon Sep 17 00:00:00 2001
From: Prashanth Sundararaman <psundara@redhat.com>
Date: Tue, 24 Mar 2020 12:37:02 -0400
Subject: [PATCH] kola: Use RpmArch() instead of architecture()

While not a comprehensive fix as suggested here: https://github.com/coreos/coreos-assembler/pull/1257#issuecomment-603281524
this helps to unblock kola tests on non x86 arches
---
 mantle/Makefile        | 10 ++--------
 mantle/kola/harness.go | 18 +++---------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/mantle/Makefile b/mantle/Makefile
index 9ba60e937e..2a9f044771 100644
--- a/mantle/Makefile
+++ b/mantle/Makefile
@@ -1,13 +1,7 @@
 PREFIX ?= /usr
 DESTDIR ?=
 
-GOARCH:=$(shell uname -m)
-# Copied from coreos-assembler Makefile
-ifeq ($(GOARCH),x86_64)
-	GOARCH=amd64
-else ifeq ($(GOARCH),aarch64)
-	GOARCH=arm64
-endif
+ARCH:=$(shell uname -m)
 
 .PHONY: build test vendor clean
 build:
@@ -16,7 +10,7 @@ build:
 .PHONY: install
 install: bin/ore bin/kola bin/plume bin/kolet
 	install -D -t $(DESTDIR)$(PREFIX)/bin bin/{ore,kola,plume}
-	install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/$(GOARCH) bin/kolet
+	install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/$(ARCH) bin/kolet
 
 test:
 	./test
diff --git a/mantle/kola/harness.go b/mantle/kola/harness.go
index 276991c941..47460726d3 100644
--- a/mantle/kola/harness.go
+++ b/mantle/kola/harness.go
@@ -314,7 +314,7 @@ func filterTests(tests map[string]*register.Test, patterns []string, pltfrm stri
 				isExcluded = true
 				break
 			}
-			allowedArchitecture, _ := isAllowed(architecture(platform), t.Architectures, t.ExcludeArchitectures)
+			allowedArchitecture, _ := isAllowed(system.RpmArch(), t.Architectures, t.ExcludeArchitectures)
 			allowed = allowed || (allowedPlatform && allowedArchitecture)
 		}
 		if isExcluded || !allowed {
@@ -327,7 +327,7 @@ func filterTests(tests map[string]*register.Test, patterns []string, pltfrm stri
 
 		// Check native tests for arch specific exclusion
 		for k, NativeFuncWrap := range t.NativeFuncs {
-			_, excluded := isAllowed(architecture(pltfrm), nil, NativeFuncWrap.ExcludeArchitectures)
+			_, excluded := isAllowed(system.RpmArch(), nil, NativeFuncWrap.ExcludeArchitectures)
 			if excluded {
 				delete(t.NativeFuncs, k)
 			}
@@ -766,7 +766,7 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
 
 	// drop kolet binary on machines
 	if t.ExternalTest != "" || t.NativeFuncs != nil {
-		if err := scpKolet(tcluster.Machines(), architecture(pltfrm)); err != nil {
+		if err := scpKolet(tcluster.Machines(), system.RpmArch()); err != nil {
 			h.Fatal(err)
 		}
 	}
@@ -803,18 +803,6 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
 	t.Run(tcluster)
 }
 
-// architecture returns the machine architecture of the given platform.
-func architecture(pltfrm string) string {
-	nativeArch := "amd64"
-	if (pltfrm == "qemu" || pltfrm == "qemu-unpriv") && QEMUOptions.Board != "" {
-		nativeArch = boardToArch(QEMUOptions.Board)
-	}
-	if pltfrm == "packet" && PacketOptions.Board != "" {
-		nativeArch = boardToArch(PacketOptions.Board)
-	}
-	return nativeArch
-}
-
 // returns the arch part of an sdk board name
 func boardToArch(board string) string {
 	return strings.SplitN(board, "-", 2)[0]