From 1495911f4aaf08ac01ca13b1cc859bcd36dd42a0 Mon Sep 17 00:00:00 2001
From: Moshe Levi <moshele@mellanox.com>
Date: Sun, 15 Mar 2020 19:48:07 +0200
Subject: [PATCH] fix deploy in travis ci

---
 .travis.yml       | 29 +++--------------------------
 scripts/deploy.sh | 10 ++++++++++
 2 files changed, 13 insertions(+), 26 deletions(-)
 create mode 100755 scripts/deploy.sh

diff --git a/.travis.yml b/.travis.yml
index bc503b9..0c4ad25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,10 @@
 language: go
 
-dist: bionic
-
-services:
-  - docker
-
 go:
   - "1.13"
 
 env:
-  global:
-    - PATH=$GOROOT/bin:$GOPATH/bin:$PATH
-    - IMAGE_NAME=mellanox/rdma-cni
+  - IMAGE_NAME=mellanox/rdma-cni
 
 before_script:
   - go get -u github.com/mattn/goveralls
@@ -29,29 +22,13 @@ deploy:
   # Push image to Dockerhub on merge to master
   - provider: script
     skip_cleanup: true
-    script: >
-      bash -cx '
-      docker tag $(IMAGE_NAME) $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):latest;
-      docker push $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):latest;
-      export DOCKER_CLI_EXPERIMENTAL="enabled";
-      docker manifest create $(IMAGE_NAME):latest $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):latest;
-      docker manifest annotate $(IMAGE_NAME):latest $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):latest --arch $(TRAVIS_CPU_ARCH);
-      docker manifest push $(IMAGE_NAME):latest
-      echo Done'
+    script: bash scripts/deploy.sh $IMAGE_NAME latest $TRAVIS_CPU_ARCH
     on:
       branch: master
   # Push image to Dockerhub on tag
   - provider: script
     skip_cleanup: true
-    script: >
-      bash -cx '
-      docker tag $(IMAGE_NAME) $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):$(TRAVIS_TAG);
-      docker push $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):$(TRAVIS_TAG);
-      export DOCKER_CLI_EXPERIMENTAL="enabled";
-      docker manifest create $(IMAGE_NAME):$(TRAVIS_TAG) $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):$(TRAVIS_TAG);
-      docker manifest annotate $(IMAGE_NAME):$(TRAVIS_TAG) $(IMAGE_NAME)-$(TRAVIS_CPU_ARCH):$(TRAVIS_TAG) --arch $(TRAVIS_CPU_ARCH);
-      docker manifest push $(IMAGE_NAME):$(TRAVIS_TAG)
-      echo Done'
+    script: bash scripts/deploy.sh $IMAGE_NAME $TRAVIS_TAG $TRAVIS_CPU_ARCH
     on:
       tags: true
       all_branches: true
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
new file mode 100755
index 0000000..ad49f1f
--- /dev/null
+++ b/scripts/deploy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+IMAGE_NAME=$1
+VERSION=$2
+CPU_ARCH=$3
+export DOCKER_CLI_EXPERIMENTAL="enabled";
+docker tag $IMAGE_NAME ${IMAGE_NAME}-${CPU_ARCH}:${VERSION}
+docker push ${IMAGE_NAME}-${CPU_ARCH}:${VERSION}
+docker manifest create ${IMAGE_NAME}:${VERSION} ${IMAGE_NAME}-${CPU_ARCH}:${VERSION}
+docker manifest annotate ${IMAGE_NAME}:${VERSION} ${IMAGE_NAME}-${CPU_ARCH}:${VERSION} --arch ${CPU_ARCH}
+docker manifest push ${IMAGE_NAME}:${VERSION}