From d74d5ad1fcbaa76e324048f0b61fcf2f6f95f656 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 14 Jan 2014 10:18:39 -0700 Subject: [PATCH] jenkins: use in-tree clone for the ceph-build repo Historically we have had a single system-wide clone of the ceph-build repository on each builder, at /srv/ceph-build. The disadvantage to this configuration is that there is no way to ensure that each of these clones are up to date. When we make changes to the ceph-build repository on GitHub, we have to manually pull the changes into each builder's local clone at /srv. Going forward, we will use the Multi-SCM plugin to Jenkins to make the ceph-setup Jenkins job use an up-to-date clone of the ceph-build repository. This will ensure that Jenkins is using the very latest code from ceph-build. The ceph-build repository will be cloned into the root of the tree. Remove the references to /srv/ceph-build and just use the relative path, "ceph-build". --- jenkins/build | 4 ++-- jenkins/setup | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins/build b/jenkins/build index 44b181cf..3bb1307b 100644 --- a/jenkins/build +++ b/jenkins/build @@ -26,11 +26,11 @@ echo "*****" env echo "*****" -if [ ! -d /srv/ceph-build ] ; then +if [ ! -d ceph-build ] ; then echo "Build tools are not installed" exit 1 fi -bindir=/srv/ceph-build +bindir=$(pwd)/ceph-build case $HOST in gitbuilder-cdep-deb* | tala* | mira*) diff --git a/jenkins/setup b/jenkins/setup index 5ef2dd98..a0b12c58 100644 --- a/jenkins/setup +++ b/jenkins/setup @@ -30,11 +30,11 @@ fi echo "Building version $(git describe) Branch $Branch" -if [ ! -d /srv/ceph-build ] ; then +if [ ! -d ceph-build ] ; then echo "Build tools are not installed" exit 1 fi -bindir=/srv/ceph-build +bindir=$(pwd)/ceph-build rm -rf dist rm -rf release -- 2.39.5