From 31ea600b284515dd3470b244f9c6e1548408ecfe Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Tue, 16 Apr 2019 14:28:19 -0700
Subject: [PATCH] images: Adds GOARM to images' Makefiles

In order to build the image binaries, the GOARM variable is required,
but not all Makefiles have it defined, causing the make to fail on
those images.

This adds the require GOARM variable to the Makefiles in question.
---
 test/images/agnhost/Makefile                  | 1 +
 test/images/apparmor-loader/Makefile          | 1 +
 test/images/metadata-concealment/Makefile     | 1 +
 test/images/nonewprivs/Makefile               | 1 +
 test/images/pets/peer-finder/Makefile         | 1 +
 test/images/pets/redis-installer/Makefile     | 1 +
 test/images/pets/zookeeper-installer/Makefile | 1 +
 test/images/resource-consumer/Makefile        | 1 +
 test/images/sample-device-plugin/Makefile     | 1 +
 9 files changed, 9 insertions(+)

diff --git a/test/images/agnhost/Makefile b/test/images/agnhost/Makefile
index c21639c38c2..9cb24411ec6 100644
--- a/test/images/agnhost/Makefile
+++ b/test/images/agnhost/Makefile
@@ -15,6 +15,7 @@
 SRCS=agnhost
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/apparmor-loader/Makefile b/test/images/apparmor-loader/Makefile
index 807d3a2a489..da6f344ff79 100644
--- a/test/images/apparmor-loader/Makefile
+++ b/test/images/apparmor-loader/Makefile
@@ -15,6 +15,7 @@
 SRCS=loader
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/metadata-concealment/Makefile b/test/images/metadata-concealment/Makefile
index 970ccd3babe..e40da5452b3 100644
--- a/test/images/metadata-concealment/Makefile
+++ b/test/images/metadata-concealment/Makefile
@@ -15,6 +15,7 @@
 SRCS=check_metadata_concealment
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/nonewprivs/Makefile b/test/images/nonewprivs/Makefile
index 660b2f2f7ec..a2a79c4655e 100644
--- a/test/images/nonewprivs/Makefile
+++ b/test/images/nonewprivs/Makefile
@@ -15,6 +15,7 @@
 SRCS = nnp
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/pets/peer-finder/Makefile b/test/images/pets/peer-finder/Makefile
index b76395dcd54..7a8f2a44087 100644
--- a/test/images/pets/peer-finder/Makefile
+++ b/test/images/pets/peer-finder/Makefile
@@ -15,6 +15,7 @@
 SRCS = peer-finder
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/pets/redis-installer/Makefile b/test/images/pets/redis-installer/Makefile
index b76395dcd54..7a8f2a44087 100644
--- a/test/images/pets/redis-installer/Makefile
+++ b/test/images/pets/redis-installer/Makefile
@@ -15,6 +15,7 @@
 SRCS = peer-finder
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/pets/zookeeper-installer/Makefile b/test/images/pets/zookeeper-installer/Makefile
index b76395dcd54..7a8f2a44087 100644
--- a/test/images/pets/zookeeper-installer/Makefile
+++ b/test/images/pets/zookeeper-installer/Makefile
@@ -15,6 +15,7 @@
 SRCS = peer-finder
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/resource-consumer/Makefile b/test/images/resource-consumer/Makefile
index 44b90a03920..d097a43247d 100644
--- a/test/images/resource-consumer/Makefile
+++ b/test/images/resource-consumer/Makefile
@@ -15,6 +15,7 @@
 SRCS = consumer consume-cpu/consume-cpu
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/sample-device-plugin/Makefile b/test/images/sample-device-plugin/Makefile
index a7921439c67..97028bf13fe 100644
--- a/test/images/sample-device-plugin/Makefile
+++ b/test/images/sample-device-plugin/Makefile
@@ -15,6 +15,7 @@
 SRCS=sampledeviceplugin
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export