From: Sébastien Han <seb@redhat.com>
Date: Tue, 27 Feb 2018 20:44:21 +0000 (+0100)
Subject: ceph-container-build-push-imgs: use a script from ceph-container
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F973%2Fhead;p=ceph-build.git

ceph-container-build-push-imgs: use a script from ceph-container

Let's execute a script in the ceph-container project instead of writting
the script here.
ceph-build does the CI so let's keep it that way.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/ceph-container-build-push-imgs/build/build b/ceph-container-build-push-imgs/build/build
index 6bbb9a63..718ed42d 100644
--- a/ceph-container-build-push-imgs/build/build
+++ b/ceph-container-build-push-imgs/build/build
@@ -2,32 +2,5 @@
 set -e
 
 
-#############
-# FUNCTIONS #
-#############
-
-function login_docker_hub {
-  echo "Login in the Docker Hub"
-  docker login -u "$DOCKER_HUB_USERNAME" -p "$DOCKER_HUB_PASSWORD"
-}
-
-function build_ceph_imgs {
-  make build.parallel
-}
-
-function push_ceph_imgs {
-  make push
-}
-
-
-########
-# MAIN #
-########
-
-login_docker_hub
-set -x
 cd "$WORKSPACE"/ceph-container/ || exit
-build_ceph_imgs
-push_ceph_imgs
-cd - || exit
-
+bash -x contrib/build-push-ceph-container-imgs.sh