From 63fde153d3ca195f07a7fc2cc5999327411f3cc5 Mon Sep 17 00:00:00 2001 From: Steve Rowe Date: Thu, 15 Mar 2018 15:26:07 -0400 Subject: [PATCH] SOLR-10912: updating copy of Jenkins precommit job script: proc max limit code seems not to work on jenkins slaves, so put it at a fixed 10k; added customization of artifact url so console output links in the JIRA comment report work properly; no longer attempting to cache the yetus download, since it always downloads every time anyway. --- .../test-patch/jenkins-precommit-script.sh | 39 +++++-------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/dev-tools/test-patch/jenkins-precommit-script.sh b/dev-tools/test-patch/jenkins-precommit-script.sh index 155e333a857..4251282cf59 100644 --- a/dev-tools/test-patch/jenkins-precommit-script.sh +++ b/dev-tools/test-patch/jenkins-precommit-script.sh @@ -31,45 +31,26 @@ YETUSDIR=${WORKSPACE}/yetus TESTPATCHBIN=${YETUSDIR}/precommit/test-patch.sh -ARTIFACTS=${WORKSPACE}/out +ARTIFACTS_SUBDIR=out +ARTIFACTS=${WORKSPACE}/${ARTIFACTS_SUBDIR} BASEDIR=${WORKSPACE}/sourcedir rm -rf "${ARTIFACTS}" mkdir -p "${ARTIFACTS}" -if [[ -d /sys/fs/cgroup/pids/user.slice ]]; then - pids=$(cat /sys/fs/cgroup/pids/user.slice/user-910.slice/pids.max) - - if [[ ${pids} -gt 13000 ]]; then - echo "passed: ${pids}" - PIDMAX=10000 - else - echo "failed: ${pids}" - PIDMAX=5500 - fi -else - systemctl status $$ 2>/dev/null - echo "passed? no limit on trusty?" - PIDMAX=10000 -fi +PIDMAX=10000 # Arbitrary limit; may need to revisit -# One-time operation: download and expand Yetus source release -# TODO: when upgrading the Yetus release, remove the old tarball YETUS_RELEASE=0.7.0 YETUS_TARBALL="yetus-${YETUS_RELEASE}.tar.gz" -if [[ ! -f "${YETUS_TARBALL}" || ! -d "$YETUSDIR}}" ]]; then - echo "Downloading Yetus ${YETUS_RELEASE}" - curl -L "https://api.github.com/repos/apache/yetus/tarball/rel/${YETUS_RELEASE}" -o "${YETUS_TARBALL}" - if [[ -d "${YETUSDIR}" ]]; then - rm -rf "${YETUSDIR}" - mkdir -p "${YETUSDIR}" - fi - gunzip -c "${YETUS_TARBALL}" | tar xpf - -C "${YETUSDIR}" --strip-components 1 -fi - +echo "Downloading Yetus ${YETUS_RELEASE}" +curl -L "https://api.github.com/repos/apache/yetus/tarball/rel/${YETUS_RELEASE}" -o "${YETUS_TARBALL}" +rm -rf "${YETUSDIR}" +mkdir -p "${YETUSDIR}" +gunzip -c "${YETUS_TARBALL}" | tar xpf - -C "${YETUSDIR}" --strip-components 1 YETUS_ARGS+=("--project=LUCENE") YETUS_ARGS+=("--basedir=${BASEDIR}") YETUS_ARGS+=("--patch-dir=${ARTIFACTS}") +YETUS_ARGS+=("--build-url-artifacts=artifact/${ARTIFACTS_SUBDIR}") YETUS_ARGS+=("--personality=${BASEDIR}/dev-tools/test-patch/lucene-solr-yetus-personality.sh") YETUS_ARGS+=("--jira-user=lucenesolrqa") YETUS_ARGS+=("--jira-password=$JIRA_PASSWORD") @@ -87,4 +68,4 @@ YETUS_ARGS+=("--contrib-guide=https://wiki.apache.org/lucene-java/HowToContribut YETUS_ARGS+=("--jenkins") YETUS_ARGS+=("LUCENE-${ISSUE_NUM}") -/bin/bash ${TESTPATCHBIN} "${YETUS_ARGS[@]}" \ No newline at end of file +/bin/bash ${TESTPATCHBIN} "${YETUS_ARGS[@]}"