Drop userContent support

The ArtifactDeployer isn't the prefered choice and there's
no reason to make BASE_PATH handling more confusing than necessary,
so just drop the userContent magic.
remotes/origin/mika/no_changes
Michael Prokop 13 years ago
parent a00449e965
commit f68b0febfb

@ -82,14 +82,8 @@ set_base_path() {
if [ -n "${BASE_PATH:-}" ] ; then
echo "*** Using provided ${BASE_PATH} as BASE_PATH ***"
else
echo "*** No BASE_PATH set. ***"
if [ -z "${distribution:-}" ]; then
BASE_PATH="${JENKINS_HOME}/userContent/${PACKAGE}-source/"
echo "*** No BASE_PATH set but \$distribution is set, using $BASE_PATH as BASE_PATH ***"
else
BASE_PATH="${JENKINS_HOME}/userContent/${PACKAGE}-source/distribution=${distribution}/"
echo "*** Neither BASE_PATH nor \$distribution set, using $BASE_PATH as BASE_PATH ***"
fi
BASE_PATH="${WORKSPACE}"
echo "*** Using \$WORKSPACE [$BASE_PATH] as default BASE_PATH ***"
fi
}

@ -206,10 +206,4 @@ git branch -D "$random_branch"
# revert to original debian/changelog to avoid merge conflicts
git checkout -- debian/changelog
# needed for deploying artifacts
mkdir -p ${JENKINS_HOME}/userContent/${JOB_NAME}/
echo "Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data"
rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"*
# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2

@ -164,10 +164,4 @@ fi
# revert to original debian/changelog to avoid highly increasing version numbers with each build
( cd source/${branch:-} ; svn revert debian/changelog )
# needed for deploying artifacts
mkdir -p "${JENKINS_HOME}/userContent/${JOB_NAME}/"
echo "*** Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data ***"
rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"*
# vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2

Loading…
Cancel
Save