From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 12 Nov 2015 17:57:08 +0000 (-0600)
Subject: use build_utils in the ceph-deploy job to install / configure chacractl
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f760b7ebd2c490487d43d39c5b225a63cbb7dfd;p=ceph-build.git

use build_utils in the ceph-deploy job to install / configure chacractl

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-deploy/build/setup b/ceph-deploy/build/setup
index 59a5c9481..e5e789dca 100644
--- a/ceph-deploy/build/setup
+++ b/ceph-deploy/build/setup
@@ -17,24 +17,9 @@ if test -f /etc/redhat-release ; then
     sudo yum install -y $rpm_deps
 fi
 
-# Create the virtualenv
-virtualenv $WORKSPACE/venv
-VENV="$WORKSPACE/venv/bin"
-
-# Define and ensure the PIP cache
-PIP_SDIST_INDEX="$HOME/.cache/pip"
-mkdir -p $PIP_SDIST_INDEX
-
-CHACRACTL_VERSION="chacractl>=0.0.4"
-
-# download packages to the local pip cache
-$VENV/pip install --upgrade --exists-action=i --download="$PIP_SDIST_INDEX" $CHACRACTL_VERSION
-# install packages from the local pip cache, ignoring pypi
-$VENV/pip install --upgrade --exists-action=i --find-links="file://$PIP_SDIST_INDEX" --no-index $CHACRACTL_VERSION
-
-# create the .chacractl config file
-cat > $HOME/.chacractl << EOF
-url = "$CHACRACTL_URL"
-user = "$CHACRACTL_USER"
-key = "$CHACRACTL_KEY"
-EOF
+source $WORKSPACE/ceph-build/scripts/build_utils.sh
+
+install_python_packages "chacractl>=0.0.4"
+
+# create the .chacractl config file using global variables
+make_chacractl_config
diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index f664ad49c..02651149b 100644
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -1,3 +1,26 @@
+- scm:
+    name: ceph-deploy
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-deploy.git
+          branches:
+            - $BRANCH
+          browser: auto
+          skip-tag: true
+          timeout: 20
+          wipe-workspace: true
+
+- scm:
+    name: ceph-build
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-build.git
+          browser-url: https://github.com/ceph/ceph-build
+          timeout: 20
+          skip-tag: true
+          wipe-workspace: true
+          basedir: "ceph-build"
+
 - job:
     name: ceph-deploy
     node: small && trusty
@@ -34,14 +57,8 @@ If this is unchecked, then then nothing is built or pushed if they already exist
 If this is checked, then the binaries will be built and pushed to chacra even if they already exist in chacra."
 
     scm:
-      - git:
-          url: https://github.com/ceph/ceph-deploy.git
-          branches:
-            - $BRANCH
-          browser: auto
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
+      - ceph-deploy
+      - ceph-build
 
     axes:
       - axis: