use build_utils in ceph-release-rpm to install/configure chacractl

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

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index ccf192df902028cea38e72fe9171b5f689b5fd42..881e0e383cffdd9dd8757c79441cf417ad815b54 100644 (file)
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -12,27 +12,12 @@ echo "Building on Host: $(hostname) Date: $(date)"
 rm -rf dist
 rm -rf RPMBUILD
 
-# 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
 
 # What are we building ?
 

diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
index 444c41889c9aa93c95689d1892d80e84dcc120c9..1042ab5e0bd1c92d0bce3f3a48a12911dda1311e 100644 (file)
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -25,6 +25,15 @@ 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-build.git
+          browser-url: https://github.com/ceph/ceph-build
+          timeout: 20
+          skip-tag: true
+          wipe-workspace: true
+          basedir: "ceph-build"
+
     axes:
       - axis:
           type: label-expression