use build_utils in the ceph-build job to install and configure chacractl

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

diff --git a/ceph-build/build/setup b/ceph-build/build/setup
index faa83f4a2bdb7b60a0952c356a4ba87ed000df2e..4f0fb54894846e2603434950cf0bb6be1a3acde9 100644 (file)
--- a/ceph-build/build/setup
+++ b/ceph-build/build/setup
@@ -66,24 +66,9 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
         ;;
 esac
 
-# Create the virtualenv
-virtualenv $WORKSPACE/venv
-VENV="$WORKSPACE/venv/bin"
+source $WORKSPACE/ceph-build/scripts/build_utils.sh
 
-# Define and ensure the PIP cache
-PIP_SDIST_INDEX="$HOME/.cache/pip"
-mkdir -p $PIP_SDIST_INDEX
+install_python_packages "chacractl>=0.0.4"
 
-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
+# create the .chacractl config file using global variables
+make_chacractl_config

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 470ed60e84f61853dd75b9466d30fd229c7617c9..74385dc3f8dde00b0f01ac749e14580d801a8a8b 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -44,6 +44,15 @@
       - shell:
           !include-raw ../../build/build_rpm
 
+    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"
+
     publishers:
       - archive:
           artifacts: 'dist/**'