Browse Source

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.
merge-requests/109/head
Michael Prokop 10 years ago
parent
commit
f68b0febfb
  1. 10
      scripts/build-and-provide-package
  2. 6
      scripts/generate-git-snapshot
  3. 6
      scripts/generate-svn-snapshot

10
scripts/build-and-provide-package

@ -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
}

6
scripts/generate-git-snapshot

@ -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

6
scripts/generate-svn-snapshot

@ -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