From: Deepak Kataria <dd7022@att.com>
Date: Thu, 3 Oct 2019 11:12:25 +0000 (+0000)
Subject: Merge "[UI] Fix ONAP Portal SDK redirection bug"
X-Git-Tag: 2.0.0~24
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=bac41a9d7cbc4464d5cd502641f78ccb8d66aab1;hp=19e7a87af0e8b17a418497b41c8b8c98708cd01f

Merge "[UI] Fix ONAP Portal SDK redirection bug"
---

diff --git a/docker/Makefile b/docker/Makefile
index 707dbc8..1f1c461 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -38,6 +38,6 @@ $(SUBDIRS_BUILD):
 
 .PHONY: $(SUBDIRS_PUSH)
 $(SUBDIRS_PUSH):
-	$(MAKE) -C $(@:-push=) .push_image
+	$(MAKE) -C $(@:-push=) push-image
 
 include build.mk
diff --git a/docker/README.rst b/docker/README.rst
index e7f3845..74f362d 100644
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -230,7 +230,7 @@ Example:
 
 .. code-block:: console
 
-    docker run -ti akraino/validation:kube-conformance-v1.15
+    docker run -ti akraino/validation:kube-conformance-v1.16
 
 By default, the container will run the `run_e2e.sh` script. If you want to
 enter the container, add */bin/sh* at the end of the command above
diff --git a/docker/build.mk b/docker/build.mk
index 2f7d398..6ecaaf5 100644
--- a/docker/build.mk
+++ b/docker/build.mk
@@ -60,6 +60,7 @@ $(MTOOL):
 .PHONY: .push_manifest
 .push_manifest: $(MTOOL)
 	$(MTOOL) push from-args \
+		--ignore-missing \
 		--platforms linux/amd64,linux/arm64 \
 		--template $(REGISTRY)/$(NAME):$(TAG_PRE)-ARCH-$(TAG_VER) \
 		--target $(REGISTRY)/$(NAME):$(TAG_PRE)-$(TAG_VER)
diff --git a/docker/docker/Makefile b/docker/docker/Makefile
index a5b4099..4d43df8 100644
--- a/docker/docker/Makefile
+++ b/docker/docker/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/hardware/Makefile b/docker/hardware/Makefile
index a5b4099..4d43df8 100644
--- a/docker/hardware/Makefile
+++ b/docker/hardware/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/helm/Makefile b/docker/helm/Makefile
index a5b4099..4d43df8 100644
--- a/docker/helm/Makefile
+++ b/docker/helm/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
index 925ac3d..43c6d80 100644
--- a/docker/k8s/Dockerfile
+++ b/docker/k8s/Dockerfile
@@ -19,9 +19,9 @@ FROM golang:alpine3.9 as build
 
 # Sonobuoy supports 3 Kubernetes minor versions: the current release and 2
 # minor versions before.
-ARG SB_TAG=v0.15.1
+ARG SB_TAG=v0.16.1
 # Determine the latest stable git tag at build time based on stable major version
-ARG K8S_VER=1.15
+ARG K8S_VER=1.16
 
 # Install dependencies
 COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
diff --git a/docker/k8s/Makefile b/docker/k8s/Makefile
index a5b4099..4d43df8 100644
--- a/docker/k8s/Makefile
+++ b/docker/k8s/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/kube-conformance/Makefile b/docker/kube-conformance/Makefile
index 61d731d..ee7b40f 100644
--- a/docker/kube-conformance/Makefile
+++ b/docker/kube-conformance/Makefile
@@ -15,7 +15,7 @@
 ##############################################################################
 
 export WORK_DIR?=$(TAG_PRE)
-export KUBE_VERSION=1.15
+export KUBE_VERSION=1.16
 export TAG_VER?=v$(KUBE_VERSION)
 
 .PHONY: .build
@@ -23,9 +23,12 @@ export TAG_VER?=v$(KUBE_VERSION)
 	$(MAKE) -C $(TAG_PRE) e2e.test kubectl ginkgo
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/mysql/Makefile b/docker/mysql/Makefile
index db91c1e..c1f627f 100644
--- a/docker/mysql/Makefile
+++ b/docker/mysql/Makefile
@@ -15,9 +15,20 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
-.PHONY: build
+# MySQL 5.6 is not supported on arm64 yet, skip building it for now
+.PHONY: build push-image
+ifneq ($(shell uname -m), aarch64)
 build: .build
+push-image: .push_image
+else
+build:
+	echo "Skipping build on aarch64 platform!"
+	exit 0
+push-image:
+	echo "Skipping push on aarch64 platform!"
+	exit 0
+endif
 
 include ../build.mk
diff --git a/docker/openstack/Makefile b/docker/openstack/Makefile
index a5b4099..4d43df8 100644
--- a/docker/openstack/Makefile
+++ b/docker/openstack/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/os/Makefile b/docker/os/Makefile
index a5b4099..4d43df8 100644
--- a/docker/os/Makefile
+++ b/docker/os/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/sonobuoy-plugin-systemd-logs/Makefile b/docker/sonobuoy-plugin-systemd-logs/Makefile
index d06875d..0af457a 100644
--- a/docker/sonobuoy-plugin-systemd-logs/Makefile
+++ b/docker/sonobuoy-plugin-systemd-logs/Makefile
@@ -20,9 +20,12 @@ export WORK_DIR?=$(TAG_PRE)
 .build:: .submodules_patched
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk
diff --git a/docker/ui/Makefile b/docker/ui/Makefile
index db91c1e..918a164 100644
--- a/docker/ui/Makefile
+++ b/docker/ui/Makefile
@@ -15,9 +15,12 @@
 ##############################################################################
 
 .PHONY: all
-all: .push_image .push_manifest
+all: push-image .push_manifest
 
 .PHONY: build
 build: .build
 
+.PHONY: push-image
+push-image: .push_image
+
 include ../build.mk