You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/12/11 11:18:45 UTC

[cassandra-builds] branch trunk updated: A more intuitve layout of devbranch builds in nightlies.a.o

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 da5f40a  A more intuitve layout of devbranch builds in nightlies.a.o
da5f40a is described below

commit da5f40aa6f1bf39fb917ddf1623bc8b8b73cf0fd
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Nov 21 19:14:20 2020 +0100

    A more intuitve layout of devbranch builds in nightlies.a.o
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 32 ++++++++++++++++++++++++-------
 jenkins-dsl/cassandra_pipeline.groovy     |  2 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 828acb7..32a4bbf 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -420,6 +420,15 @@ matrixJob('Cassandra-template-cqlsh-tests') {
               """)
     }
     publishers {
+        publishOverSsh {
+            server('Nightlies') {
+                transferSet {
+                    sourceFiles("**/cqlshlib.xml,**/nosetests.xml, **/*.head")
+                    remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
+                }
+            }
+            failOnError(false)
+        }
         archiveArtifacts {
             pattern('**/cqlshlib.xml,**/nosetests.xml, **/*.head')
             allowEmpty()
@@ -638,7 +647,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
     }
     compressBuildLog()
     logRotator {
-        numToKeep(10)
+        numToKeep(90)
         artifactNumToKeep(10)
     }
     wrappers {
@@ -690,7 +699,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
             server('Nightlies') {
                 transferSet {
                     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}/")
+                    remoteDirectory("cassandra/devbranch/Cassandra-devbranch-artifacts/\${BUILD_NUMBER}/\${JOB_NAME}/")
                 }
             }
             failOnError(false)
@@ -723,7 +732,7 @@ testTargets.each {
         }
         compressBuildLog()
         logRotator {
-            numToKeep(10)
+            numToKeep(90)
             artifactNumToKeep(10)
         }
         wrappers {
@@ -782,7 +791,7 @@ testTargets.each {
                 server('Nightlies') {
                     transferSet {
                         sourceFiles("build/test/logs/**")
-                        remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
+                        remoteDirectory("cassandra/devbranch/Cassandra-devbranch-${targetName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
                     }
                 }
                 failOnError(false)
@@ -825,7 +834,7 @@ dtestTargets.each {
         compressBuildLog()
         compressBuildLog()
         logRotator {
-            numToKeep(10)
+            numToKeep(90)
             artifactNumToKeep(10)
         }
         wrappers {
@@ -899,7 +908,7 @@ dtestTargets.each {
                 server('Nightlies') {
                     transferSet {
                         sourceFiles("**/test_stdout.txt.xz,**/ccm_logs.tar.xz")
-                        remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/")
+                        remoteDirectory("cassandra/devbranch/Cassandra-devbranch-${targetName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
                     }
                 }
                 failOnError(false)
@@ -934,7 +943,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
     concurrentBuild()
     compressBuildLog()
     logRotator {
-        numToKeep(10)
+        numToKeep(90)
         artifactNumToKeep(10)
     }
     wrappers {
@@ -993,6 +1002,15 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
         shell('./pylib/cassandra-cqlsh-tests.sh $WORKSPACE')
     }
     publishers {
+        publishOverSsh {
+            server('Nightlies') {
+                transferSet {
+                    sourceFiles("**/test_stdout.txt.xz,**/ccm_logs.tar.xz")
+                    remoteDirectory("cassandra/devbranch/Cassandra-devbranch-cqlsh-tests/\${BUILD_NUMBER}/\${JOB_NAME}/")
+                }
+            }
+            failOnError(false)
+        }
         archiveArtifacts {
             pattern('**/cqlshlib.xml,**/nosetests.xml, **/*.head')
             allowEmpty()
diff --git a/jenkins-dsl/cassandra_pipeline.groovy b/jenkins-dsl/cassandra_pipeline.groovy
index 1f1d807..9830fc2 100644
--- a/jenkins-dsl/cassandra_pipeline.groovy
+++ b/jenkins-dsl/cassandra_pipeline.groovy
@@ -286,7 +286,7 @@ pipeline {
         post {
             always {
                 archiveArtifacts artifacts: 'cassandra-test-report.txt.xz', fingerprint: true
-                sshPublisher(publishers: [sshPublisherDesc(configName: 'Nightlies', transfers: [sshTransfer(remoteDirectory: 'cassandra/${JOB_NAME}/${BUILD_NUMBER}/', sourceFiles: 'cassandra-test-report.txt.xz, TESTS-TestSuites.xml.xz')])])
+                sshPublisher(publishers: [sshPublisherDesc(configName: 'Nightlies', transfers: [sshTransfer(remoteDirectory: 'cassandra/devbranch/${JOB_NAME}/${BUILD_NUMBER}/', sourceFiles: 'cassandra-test-report.txt.xz, TESTS-TestSuites.xml.xz')])])
             }
         }
       }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org