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 4d27eb424e6971746f41a32bb70a964a386cc30a
Merge: 183812b 2f8fe37
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed May 6 13:11:25 2020 +0200

    Merge branch 'cassandra-3.11' into trunk

 .jenkins/Jenkinsfile | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --cc .jenkins/Jenkinsfile
index 3b75ee2,767db54..0a453b8
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -26,157 -26,132 +26,153 @@@
  pipeline {
    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 {
 -                  build job: "${env.JOB_NAME}-stress-test"
 +    }
 +    stage('Test') {
 +        parallel {
 +          stage('stress') {
 +            steps {
-                 warnError('Tests unstable') {
-                     build job: "${env.JOB_NAME}-stress-test"
-                 }
++                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"
-                 }
++                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}-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('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('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"
@@@ -342,10 -318,11 +338,12 @@@
              }
            }
          }
 +    }
      stage('Summary') {
        steps {
-           junit '**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml'
+           sh "git clone 
https://gitbox.apache.org/repos/asf/cassandra-builds.git";
+           sh "./cassandra-builds/build-scripts/cassandra-test-report.sh"
+           junit '**/build/test/**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml'
  
            // the following should fail on any installation other than 
builds.apache.org
            //  TODO: keep jenkins infrastructure related settings in 
`cassandra_job_dsl_seed.groovy`


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

Reply via email to