You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/03/15 19:26:23 UTC
[1/2] lucene-solr:master: 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
Repository: lucene-solr
Updated Branches:
refs/heads/master 67dab22f2 -> 63fde153d
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.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/63fde153
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/63fde153
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/63fde153
Branch: refs/heads/master
Commit: 63fde153d3ca195f07a7fc2cc5999327411f3cc5
Parents: cc1ad49
Author: Steve Rowe <sa...@apache.org>
Authored: Thu Mar 15 15:26:07 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu Mar 15 15:26:14 2018 -0400
----------------------------------------------------------------------
.../test-patch/jenkins-precommit-script.sh | 39 +++++---------------
1 file changed, 10 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/63fde153/dev-tools/test-patch/jenkins-precommit-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/test-patch/jenkins-precommit-script.sh b/dev-tools/test-patch/jenkins-precommit-script.sh
index 155e333..4251282 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[@]}"
[2/2] lucene-solr:master: SOLR-10912: excluding apparently
unnecessary plugins: 'junit' and 'javac' (the 'unit' and 'compile' plugins
are producing output but the 'j' ones aren't)
Posted by sa...@apache.org.
SOLR-10912: excluding apparently unnecessary plugins: 'junit' and 'javac' (the 'unit' and 'compile' plugins are producing output but the 'j' ones aren't)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cc1ad49e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cc1ad49e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cc1ad49e
Branch: refs/heads/master
Commit: cc1ad49e72bb6753997711e3cd7fb05d3c319598
Parents: 67dab22
Author: Steve Rowe <sa...@apache.org>
Authored: Thu Mar 15 15:22:42 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu Mar 15 15:26:14 2018 -0400
----------------------------------------------------------------------
dev-tools/test-patch/lucene-solr-yetus-personality.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cc1ad49e/dev-tools/test-patch/lucene-solr-yetus-personality.sh
----------------------------------------------------------------------
diff --git a/dev-tools/test-patch/lucene-solr-yetus-personality.sh b/dev-tools/test-patch/lucene-solr-yetus-personality.sh
index e519639..39929c5 100644
--- a/dev-tools/test-patch/lucene-solr-yetus-personality.sh
+++ b/dev-tools/test-patch/lucene-solr-yetus-personality.sh
@@ -28,8 +28,9 @@
# 4) Add a "<plugin>_rebuild" function to call out to ant to perform the validation method.
# See examples of the above-described function types ^^ below.
-PLUGIN_LIST="ant,testoutput,jira,compile,javac,junit,unit,test4tests,checkluceneversion"
-PLUGIN_LIST+=",ratsources,checkforbiddenapis,checklicenses,validatesourcepatterns,validaterefguide"
+PLUGIN_LIST="ant,jira,compile,unit,test4tests"
+PLUGIN_LIST+=",testoutput,checkluceneversion,ratsources,checkforbiddenapis,checklicenses"
+PLUGIN_LIST+=",validatesourcepatterns,validaterefguide"
personality_plugins "${PLUGIN_LIST}"
add_test_type "checkluceneversion"