From cb4df264c42670edba493bbfac7eba1a274976f3 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 12 Nov 2015 11:31:46 -0600 Subject: [PATCH] use build_utils in the ceph-build job to install and configure chacractl Signed-off-by: Andrew Schoen --- ceph-build/build/setup | 23 ++++---------------- ceph-build/config/definitions/ceph-build.yml | 9 ++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/ceph-build/build/setup b/ceph-build/build/setup index faa83f4a..4f0fb548 100644 --- 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 470ed60e..74385dc3 100644 --- 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/**' -- 2.39.5