From 85d97df583e2cd6ab6b566a8239c2f8a68f4f017 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 27 Dec 2017 07:47:20 -0300
Subject: [PATCH] Fix publish.sh ARCH error (#1860)

---
 .travis.yml        | 20 +++++---------------
 .travis/publish.sh |  5 +++++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa41e70be..47edb8fd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,31 +55,21 @@ jobs:
   # split builds to avoid job timeouts
   - stage: publish amd64
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
-    env:
-    - ARCH=amd64
     script:
-    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh
+    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh amd64
   - stage: publish arm
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
-    env:
-    - ARCH=arm
     script:
-    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh
+    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh arm
   - stage: publish arm64
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
-    env:
-    - ARCH=arm64
     script:
-    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh
+    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh arm64
   - stage: publish ppc64le
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
-    env:
-    - ARCH=ppc64le
     script:
-    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh
+    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh ppc64le
   - stage: publish s390x
     if: type = api AND branch = master AND repo = kubernetes/ingress-nginx
-    env:
-    - ARCH=s390x
     script:
-    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh
+    - travis_wait ${TRAVIS_TIMEOUT} .travis/publish.sh s390x
diff --git a/.travis/publish.sh b/.travis/publish.sh
index a06f105de..390d4c590 100755
--- a/.travis/publish.sh
+++ b/.travis/publish.sh
@@ -21,6 +21,11 @@ source $DIR/common.sh
 echo "Login to quay.io..."
 docker login --username=$QUAY_USERNAME --password=$QUAY_PASSWORD quay.io >/dev/null 2>&1
 
+if [ $# -eq "1" ]
+then
+    export ARCH=$1
+fi
+
 case "$COMPONENT" in
 "ingress-controller")
     $DIR/ingress-controller.sh