This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1664da7 ninja-fix make removing of dangling docker volumes a failsafe
attempt
1664da7 is described below
commit 1664da759bb183759d89e8a70200ca804f86d6cd
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Jan 22 11:57:19 2024 +0100
ninja-fix make removing of dangling docker volumes a failsafe attempt
---
contribulyze/contribulyze.aliases | 14 +++++++++-----
contribulyze/contribulyze.py | 14 +++++++++++---
contribulyze/contribulyze.sh | 24 ++++++++++++++++++------
jenkins-dsl/cassandra_job_dsl_seed.groovy | 26 +++++++++++++-------------
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/contribulyze/contribulyze.aliases
b/contribulyze/contribulyze.aliases
index 044dfe5..46f5628 100644
--- a/contribulyze/contribulyze.aliases
+++ b/contribulyze/contribulyze.aliases
@@ -1,10 +1,10 @@
Aaron Morton,amorton
Adam Holmberg,aholmber,Adam Holberg
Adrian Cole,Adrain Cole
-Aleksandr Sorokoumov,Aleksandr Soromoukov
+Aleksandr Sorokoumov,Aleksandr Soromoukov,Aleksandr Sorokoumov
Aleksey Yeschenko,iamaleksey,Aleksey,ayeschenko,Aleksey Yeshchenko,iamaleskey
Aleksei Zotov,Alexey Zotov,Aleksei Zoto,azotcsit,Alexander Zotov
-Andrés de la Peña,Andres de la Peña,adelapena,Andres de la Pena,adelpena
+Andrés de la Peña,Andres de la Peña,adelapena,Andres de la
Pena,adelpena,Andrés de la Peña
Ariel Weisberg,aweisberg,Ariel,awiesberg
Ben Coverston,bcoverston
Benedict Elliott Smith,Benedict,bes,Benedict Elliot
Smith,belliottsmith,belliotsmith,Benedict Elliott-Smith
@@ -21,10 +21,12 @@ David Capwell,dcapwell
Deepak Vohra,dvohra
Dinesh Joshi,Dinesh A. Joshi
Eduard Tudenhöfner,Eduard Tudenhoefner
-Ekaterina Dimitrova,Ekaterina Dimotrova,edimitrova,Ekaterina Dimitrov
+Ekaterina Dimitrova,Ekaterina Dimotrova,edimitrova,Ekaterina
Dimitrov,Ekaterina Dimimtrova
Eric Evans,eevans
Eric Ramirez,Erick Ramirez,Erick Ramirex,erickramirezau
Gary Dusbabek,gdusbabek,gdusbabke,gdusbabe
+Henry Hughes,hhughes
+Jacek Lewandowski,jacek-lewandowski,jlewandowski,Jacek Lewandowski,Jacek
Lewandowki
Jake Luciani,T Jake Luciani,tjake,jake
Jaroslaw Grabowski,jtgrabowski
Jason Brown,jasobrown,jasobraown
@@ -35,15 +37,17 @@ Jonathan Ellis,jbellis,jebllis
Joel Knighton,jknighton
Jordan West,jrwest
Joey Lynch,Joseph Lynch
-Josh McKenzie,jmckenzie,josh,JoshuaMcKenzie,Joshua McKenzie
+Josh McKenzie,jmckenzie,josh,JoshuaMcKenzie,Joshua McKenzie,josh-mckenzie
Jun Rao,junrao
Lorina Poland,polandll
Marcus Eriksson,Marcuse,Marcus,Krummas,Marcus Erikkson
Matthew Dennis,mdennis
Maxwell Guo,Maxwell-Guo,maxwellguo,xuanling.gc
+Maxim Muzafarov,mmuzaf
Michael Kjellman,mkjellman
-Mick Semb Wever,Michael Semb Wever,Mck SembWever,Michael SembWever,Mck Semb
Wever
+Mick Semb Wever,Michael Semb Wever,Mck SembWever,Michael SembWever,Mck Semb
Wever,Mchael Semb Wever,Michaem Semb Wever
Nate McCall,zznate,Nat McCall
+Ningzi Zhan,ningzi.zhan
Paul Cannon,paul cannon,pcannon
Paulo Motta,paulo,pauloricardomg,pmotta,Paul Motta
Pavel Yaskevich,Pavel YAskevich,pyaskevich
diff --git a/contribulyze/contribulyze.py b/contribulyze/contribulyze.py
index f7489b3..17527ed 100755
--- a/contribulyze/contribulyze.py
+++ b/contribulyze/contribulyze.py
@@ -335,7 +335,7 @@ class Contributor(object):
out.write('<hr />\n')
out.write('<div class="h3" id="%s" title="%s">\n' % (log.sha, log.sha))
out.write('<pre>\n')
- sha = '<a href="https://github.com/apache/cassandra/commit/%s";>%s</a>' %
(log.sha, log.sha)
+ sha = '<a
href="https://github.com/search?q=org:apache+%s+repo:apache/cassandra*&type=commits&ref=advsearch";>%s</a>'
% (log.sha, log.sha)
out.write('<b>%s | %s | %s</b>\n\n' % (sha, escape_html(log.author),
log.date))
out.write(spam_guard_in_html_block(re.sub(r'for CASSANDRA-([0-9]+)',
r'for <a
href="https://issues.apache.org/jira/browse/CASSANDRA-\1";>CASSANDRA-\1</a>',
escape_html(log.message))))
out.write('</pre>\n')
@@ -453,6 +453,7 @@ log_header_re = re.compile('^commit ([0-9a-z]+)$')
patch_by_re = re.compile('(?:.*\n)*.*patch by ([^;]+)(;|,)',
flags=re.IGNORECASE | re.MULTILINE)
reviewed_by_re = re.compile('(?:.*\n)*.*[;, ](?:review|test)(?:ed)? by
((?:.|\n)+?)(?=(?: |\n)+for(?: |\n)+(?:cassandra-|#[0-9]+))',
flags=re.IGNORECASE | re.MULTILINE)
coauthored_by_re = re.compile(' *co-authored-by: ([^<]+)', re.IGNORECASE)
+author_re = re.compile('^Author: ([^<]+)')
def graze(input):
line = input.readline()
@@ -471,12 +472,19 @@ def graze(input):
if LogMessage.latest is None: LogMessage.latest = log.date
patch_field = Field("Patch")
review_field = Field("Review")
+ m = author_re.match(log.author)
+ if m:
+ c = Contributor.get(" ".join(m.group(1).strip().split()), None)
+ patch_field.add_contributor(c)
+ log.add_field(patch_field)
+ c.add_activity(patch_field, log)
# Parse the log message.
while line != '':
line = input.readline()
if line == '\n': continue
m = log_header_re.match(line)
- if m:
+ if m:
+ # found a new commit, do regexp against existing log.message
m = patch_by_re.match(log.message)
if m:
authors = re.split(',|&|( |\n)and( |\n)(by( |\n))?',
m.group(1))
@@ -502,13 +510,13 @@ def graze(input):
c.add_collaboration(patch_field)
c.add_collaboration(review_field)
break
- log.accum(line)
m = coauthored_by_re.match(line)
if m:
c = Contributor.get(" ".join(m.group(1).strip().split()), None)
patch_field.add_contributor(c)
log.add_field(patch_field)
c.add_activity(patch_field, log)
+ log.accum(line)
#
# HTML output stuff.
diff --git a/contribulyze/contribulyze.sh b/contribulyze/contribulyze.sh
index bcab3dc..9b14435 100755
--- a/contribulyze/contribulyze.sh
+++ b/contribulyze/contribulyze.sh
@@ -13,10 +13,10 @@ mkdir -p /tmp/contribulyze-repos
mkdir -p /tmp/contribulyze-html
cd /tmp/contribulyze-repos
-repos=("https://github.com/apache/cassandra.git";
"https://github.com/apache/cassandra-dtest.git";
"https://github.com/apache/cassandra-builds.git";
"https://github.com/apache/cassandra-in-jvm-dtest-api.git";
"https://github.com/apache/cassandra-harry.git";
"https://github.com/apache/cassandra-website.git";
"https://github.com/datastax/java-driver.git";
"https://github.com/datastax/python-driver.git";)
+repos=("https://github.com/apache/cassandra.git";
"https://github.com/apache/cassandra-dtest.git";
"https://github.com/apache/cassandra-builds.git";
"https://github.com/apache/cassandra-in-jvm-dtest-api.git";
"https://github.com/apache/cassandra-harry.git";
"https://github.com/apache/cassandra-website.git";
"https://github.com/apache/cassandra-java-driver.git";
"https://github.com/datastax/python-driver.git";
"https://github.com/apache/cassandra-sidecar.git";
"https://github.com/apache/cassandra- [...]
# the different groups we want separate contribulyze reports on. note '..'
refers to everything.
-groups=('..' 'website_and_docs' 'build_and_tools' 'packaging_and_release'
'test_and_ci' 'cassandra_src' 'java-driver' 'python-driver')
+groups=('..' 'website_and_docs' 'build_and_tools' 'packaging_and_release'
'test_and_ci' 'cassandra_src' 'cassandra-java-driver' 'python-driver'
'cassandra-sidecar' 'cassandra-analytics' 'cassandra-accord')
for repo in ${repos[*]} ; do
git clone --quiet ${repo}
@@ -55,9 +55,9 @@ for group in ${groups[*]} ; do
groupings=("cassandra/src")
;;
- "java-driver")
- groupings=("java-driver")
- continue # FIXME commit messages in java-driver do not follow the "patch
by …; reviewed by … for CASSANDRA-" precedence
+ "cassandra-java-driver")
+ groupings=("cassandra-java-driver")
+ #continue # FIXME commit messages in java-driver do not follow the
"patch by …; reviewed by … for CASSANDRA-" precedence
;;
"python-driver")
@@ -65,8 +65,20 @@ for group in ${groups[*]} ; do
continue # FIXME commit messages in python-driver do not follow the
"patch by …; reviewed by … for CASSANDRA-" precedence
;;
+ "cassandra-sidecar")
+ groupings=("cassandra-sidecar")
+ ;;
+
+ "cassandra-analytics")
+ groupings=("cassandra-analytics")
+ ;;
+
+ "cassandra-accord")
+ groupings=("cassandra-accord")
+ ;;
+
*)
- groupings=("cassandra" "cassandra-dtest" "cassandra-builds"
"cassandra-website")
+ groupings=("cassandra" "cassandra-dtest" "cassandra-in-jvm-dtest-api"
"cassandra-harry" "cassandra-builds" "cassandra-website"
"cassandra-java-driver" "cassandra-sidecar" "cassandra-analytics"
"cassandra-accord")
;;
esac
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 105191e..fb46360 100755
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -498,7 +498,7 @@ cassandraBranchesInTreeScript.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -636,7 +636,7 @@ cassandraBranchesInTreeScript.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep
-af "cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra.
|| echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true
| xargs -r docker rm -v ;
+ docker volume ls -qf dangling=true
| xargs -r docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; du
-xm / 2>/dev/null | sort -rn | head -n 30 ; df -h ;
echo "Cleaning tmp…";
@@ -782,7 +782,7 @@ cassandraBranchesInTreeScript.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true |
xargs -r docker rm -v ;
+ docker volume ls -qf dangling=true |
xargs -r docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -897,7 +897,7 @@ cassandraBranchesInTreeScript.each {
echo "Cleaning processes…" ;
if ! (pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts") ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1025,7 +1025,7 @@ cassandraBranches.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1120,7 +1120,7 @@ cassandraBranches.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true |
xargs -r docker rm -v ;
+ docker volume ls -qf dangling=true |
xargs -r docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; du -xm /
2>/dev/null | sort -rn | head -n 30 ; df -h ;
echo "Cleaning tmp…";
@@ -1223,7 +1223,7 @@ cassandraBranches.each {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true |
xargs -r docker rm -v ;
+ docker volume ls -qf dangling=true |
xargs -r docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1306,7 +1306,7 @@ cassandraBranches.each {
echo "Cleaning processes…" ;
if ! (pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts") ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1465,7 +1465,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
echo "Cleaning processes…" ;
if ! (pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts") ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r docker
rm -v ;
+ docker volume ls -qf dangling=true | xargs -r docker
rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1594,7 +1594,7 @@ testTargets.each {
echo "Cleaning processes…" ;
if ! (pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts") ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;\n\
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; du -xm / 2>/dev/null
| sort -rn | head -n 30 ; df -h ;
echo "Cleaning tmp…";
@@ -1739,7 +1739,7 @@ archs.each {
echo "Cleaning processes…" ;
if ! (pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts") ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r
docker rm -v ;
+ docker volume ls -qf dangling=true | xargs -r
docker rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -1860,7 +1860,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
echo "Cleaning processes…" ;
if ! ( pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ) ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
- docker volume ls -qf dangling=true | xargs -r docker
rm -v ;
+ docker volume ls -qf dangling=true | xargs -r docker
rm -v || true ;
if pgrep -xa docker || pgrep -af
"cassandra-builds/build-scripts" ; then docker system prune --force --filter
"until=${maxJobHours}h" || true ; else docker system prune --all --force
--volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
@@ -2030,4 +2030,4 @@ job('contribulyze') {
failOnError(false)
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
