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/03/28 10:52:42 UTC
[cassandra] branch trunk updated (0934730 -> aec4c31)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 0934730 Merge branch 'cassandra-3.11' into trunk
new 3940a9e Jenkins 'Cassandra' label applied to the declarative pipeline
new aebd33f Merge branch 'cassandra-2.2' into cassandra-3.0
new ec21981 Merge branch 'cassandra-3.0' into cassandra-3.11
new aec4c31 Merge branch 'cassandra-3.11' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.jenkins/Jenkinsfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by mc...@apache.org.
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.git
commit aec4c31fcc0e347aeda9ed5a0b4e66e3ce243348
Merge: 0934730 ec21981
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Mar 28 11:50:02 2020 +0100
Merge branch 'cassandra-3.11' into trunk
.jenkins/Jenkinsfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --cc .jenkins/Jenkinsfile
index ab0280d,384bcab..3b75ee2
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -20,161 -20,140 +20,163 @@@
// Jenkins infrastructure related settings should be kept in
// https://github.com/apache/cassandra-builds/blob/master/jenkins-dsl/cassandra_job_dsl_seed.groovy
//
+ // Validate/lint this file using the following command
+ // `curl -X POST -F "jenkinsfile=<.jenkins/Jenkinsfile" https://builds.apache.org/pipeline-model-converter/validate`
pipeline {
- agent any
+ agent { label 'cassandra' }
stages {
- stage('Init') {
- steps {
- cleanWs()
- }
+ stage('Init') {
+ steps {
+ cleanWs()
}
- stage('Build') {
- steps {
- build job: "${env.JOB_NAME}-artifacts"
- }
+ }
+ stage('Build') {
+ steps {
+ build job: "${env.JOB_NAME}-artifacts"
}
- stage('Test') {
- parallel {
- stage('stress') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-stress-test"
+ }
+ stage('Test') {
+ parallel {
+ stage('stress') {
+ steps {
+ warnError('Tests unstable') {
+ build job: "${env.JOB_NAME}-stress-test"
+ }
+ }
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('stress-test')
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('stress-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('stress-test')
- }
- }
- }
+ unstable {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('stress-test')
+ }
+ }
}
}
- stage('JVM DTests') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-jvm-dtest"
+ }
+ stage('fqltool') {
+ steps {
+ warnError('Tests unstable') {
+ build job: "${env.JOB_NAME}-fqltool-test"
+ }
+ }
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('fqltool-test')
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
+ unstable {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('fqltool-test')
+ }
+ }
}
}
- stage('units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test"
- }
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
+ }
+ stage('JVM DTests') {
+ steps {
+ warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-jvm-dtest-forking"
++ build job: "${env.JOB_NAME}-jvm-dtest"
}
- }
}
- stage('long units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-long-test"
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
- copyTestResults('test-jvm-dtest-forking')
++ copyTestResults('jvm-dtest')
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
+ unstable {
+ warnError('missing test xml files') {
+ script {
- copyTestResults('test-jvm-dtest-forking')
++ copyTestResults('jvm-dtest')
+ }
+ }
}
}
- stage('burn') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-burn"
+ }
+ stage('units') {
+ steps {
+ warnError('Tests unstable') {
+ build job: "${env.JOB_NAME}-test"
+ }
+ }
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test')
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
+ unstable {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test')
+ }
+ }
+ }
+ }
+ }
+ stage('long units') {
+ steps {
+ warnError('Tests unstable') {
+ build job: "${env.JOB_NAME}-long-test"
}
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
+ }
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('long-test')
+ }
+ }
+ }
+ unstable {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('long-test')
+ }
+ }
+ }
+ }
+ }
+ stage('burn') {
+ steps {
+ warnError('Tests unstable') {
+ build job: "${env.JOB_NAME}-test-burn"
}
+ }
+ post {
+ success {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-burn')
+ }
+ }
+ }
+ unstable {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-burn')
+ }
+ }
}
}
- stage('cdc') {
+ }
+ stage('cdc') {
steps {
warnError('Tests unstable') {
build job: "${env.JOB_NAME}-test-cdc"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org