This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push:
new 4ac6686 Follow-up to CASSANDRA-16128. Fixes printing of *.head files,
website dsl, and removes javadoc->nightlies uploads.
4ac6686 is described below
commit 4ac6686480120557e5b55e63d127264adc88d75b
Author: Mick Semb Wever <[email protected]>
AuthorDate: Wed Sep 23 15:01:44 2020 +0200
Follow-up to CASSANDRA-16128. Fixes printing of *.head files, website dsl,
and removes javadoc->nightlies uploads.
ref:
https://issues.apache.org/jira/browse/CASSANDRA-16128?focusedCommentId=17199475&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17199475
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 24 +++++++-----------------
jenkins-dsl/cassandra_pipeline.groovy | 4 ++--
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 50e0102..8c7ebfc 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -137,10 +137,6 @@ matrixJob('Cassandra-template-artifacts') {
sourceFiles("build/apache-cassandra-*.tar.gz,
build/apache-cassandra-*.jar, build/apache-cassandra-*.pom,
build/cassandra*.deb, build/cassandra*.rpm")
remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
}
- transferSet {
- sourceFiles("build/javadoc/**/*")
- remoteDirectory("cassandra/\${JOB_NAME}/")
- }
}
failOnError(false)
}
@@ -308,10 +304,6 @@ matrixJob('Cassandra-template-dtest-matrix') {
sourceFiles("**/nosetests.xml,**/test_stdout.txt,**/ccm_logs.tar.xz")
remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
}
- transferSet {
- sourceFiles("build/javadoc/**/*")
- remoteDirectory("cassandra/\${JOB_NAME}/")
- }
}
failOnError(false)
}
@@ -627,10 +619,6 @@ matrixJob('Cassandra-devbranch-artifacts') {
sourceFiles("build/apache-cassandra-*.tar.gz,
build/apache-cassandra-*.jar, build/apache-cassandra-*.pom,
build/cassandra*.deb, build/cassandra*.rpm")
remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
}
- transferSet {
- sourceFiles("build/javadoc/**/*")
- remoteDirectory("cassandra/\${JOB_NAME}/")
- }
}
failOnError(false)
}
@@ -697,7 +685,7 @@ testTargets.each {
git clean -xdff ;
git clone --depth 1 --single-branch -b ${buildsBranch}
${buildsRepo} ;
echo "cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`" ;
- echo "Cassandra-devbranch-${targetName}: `git log -1
--pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetName}.head ;
+ echo "Cassandra-devbranch-${targetName} cassandra: `git
log -1 --pretty=format:'%h %an %ad %s'`" >
Cassandra-devbranch-${targetName}.head ;
""")
shell("./cassandra-builds/build-scripts/cassandra-test.sh
${targetName}")
}
@@ -803,7 +791,7 @@ dtestTargets.each {
git clean -xdff ;
git clone --depth 1 --single-branch -b ${buildsBranch}
${buildsRepo} ;
echo "cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`" ;
- echo "Cassandra-devbranch-${targetName}: `git log -1
--pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetName}.head ;
+ echo "Cassandra-devbranch-${targetName} cassandra: `git
log -1 --pretty=format:'%h %an %ad %s'`" >
Cassandra-devbranch-${targetName}.head ;
""")
shell("sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh
\$REPO \$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch}
\$DOCKER_IMAGE ${targetName} \${split}/${splits}")
}
@@ -826,7 +814,7 @@ dtestTargets.each {
postBuildTask {
task('.', """
echo "Cleaning project…" ; git clean -xdff ;
- echo "Pruning docker…" ; if pgrep -af jenkinscommand.sh;
then system prune -f --filter "until=${maxJobHours}h"; else docker system prune
-f --volumes ; fi;
+ echo "Pruning docker…" ; if pgrep -af jenkinscommand.sh;
then docker system prune -f --filter "until=${maxJobHours}h"; else docker
system prune -f --volumes ; fi;
echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
@@ -973,10 +961,12 @@ job('cassandra-website') {
git {
remote {
url('https://gitbox.apache.org/repos/asf/cassandra-website.git')
- credentials('jenkins (master pub key)')
+ credentials('9b041bd0-aea9-4498-a576-9eeb771411dd') //
"jenkins"
}
- branch('master')
+ branch('*/master')
extensions {
+ wipeOutWorkspace()
+ cleanBeforeCheckout()
cleanAfterCheckout()
}
}
diff --git a/jenkins-dsl/cassandra_pipeline.groovy
b/jenkins-dsl/cassandra_pipeline.groovy
index dcb23c8..d40fb93 100644
--- a/jenkins-dsl/cassandra_pipeline.groovy
+++ b/jenkins-dsl/cassandra_pipeline.groovy
@@ -243,8 +243,8 @@ pipeline {
echo "sha: ${commit_head_sha}; msg: ${commit_head_msg}"
}
slackSend channel: '#cassandra-builds-patches', message: ":apache:
<${env.BUILD_URL}|${currentBuild.fullDisplayName}> completed:
${currentBuild.result}.
<https://github.com/${REPO}/cassandra/commit/${commit_head_sha}|${REPO}
${commit_head_sha}>\n${commit_head_msg}"
- sh "echo \"Build based on: `cat *.head`\""
- sh "echo \"cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`\""
+ sh "echo \"cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`\" > builds.head"
+ sh "cat *.head"
}
post {
always {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
