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/01/21 18:15:43 UTC

[cassandra] branch trunk updated (1fbd329 -> 8f7f6e9)

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 1fbd329  Release session from cache when closing QueryReplayer
     new d69f769  Create Jenkins pipeline definition, and split out Jenkins test-all builds to individual builds for each of the test targets
     new 14aa561  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 6a8e211  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 8f7f6e9  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   | 366 +++++++++++++++++++++++++++++++++++++++++++++++++
 build.xml              |   6 +-
 ide/idea/workspace.xml |   1 -
 3 files changed, 367 insertions(+), 6 deletions(-)
 create mode 100644 .jenkins/Jenkinsfile


---------------------------------------------------------------------
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 8f7f6e903b0dea5f3cc1f5666308216ce0bd3c7d
Merge: 1fbd329 6a8e211
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Jan 21 19:11:21 2020 +0100

    Merge branch 'cassandra-3.11' into trunk

 .jenkins/Jenkinsfile   | 366 +++++++++++++++++++++++++++++++++++++++++++++++++
 build.xml              |   6 +-
 ide/idea/workspace.xml |   1 -
 3 files changed, 367 insertions(+), 6 deletions(-)

diff --cc .jenkins/Jenkinsfile
index 0000000,353739f..ab0280d
mode 000000,100644..100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -1,0 -1,342 +1,366 @@@
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License.  You may obtain a copy of the License at
+ //
+ //    https://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied.  See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ //
+ //
+ // Jenkins declaration of how to build and test the current codebase.
+ //  Jenkins infrastructure related settings should be kept in
+ //    https://github.com/apache/cassandra-builds/blob/master/jenkins-dsl/cassandra_job_dsl_seed.groovy
+ //
+ 
+ pipeline {
+   agent any
+   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}-test-jvm-dtest-forking"
++          }
++          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('test-jvm-dtest-forking')
 -                        }
 -                    }
 -                }
 -                unstable {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('test-jvm-dtest-forking')
 -                        }
 -                    }
 -                }
++              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"
+                 }
 -              }
+             }
 -            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')
++                      }
+                   }
+               }
 -              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')
++                      }
++                  }
+               }
+             }
 -            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"
+                   }
+               }
+               post {
+                 success {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('test-cdc')
++                          copyTestResults('test-cdc')
+                         }
+                     }
+                 }
+                 unstable {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('test-cdc')
++                          copyTestResults('test-cdc')
+                         }
+                     }
+                 }
+               }
+             }
+             stage('compression') {
+               steps {
+                   warnError('Tests unstable') {
+                     build job: "${env.JOB_NAME}-test-compression"
+                   }
+               }
+               post {
+                 success {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('test-compression')
++                          copyTestResults('test-compression')
+                         }
+                     }
+                 }
+                 unstable {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('test-compression')
++                          copyTestResults('test-compression')
+                         }
+                     }
+                 }
+               }
+             }
+             stage('cqlsh') {
+               steps {
+                   warnError('Tests unstable') {
+                     build job: "${env.JOB_NAME}-cqlsh-tests"
+                   }
+               }
+               post {
+                 success {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('cqlsh-test')
++                          copyTestResults('cqlsh-tests')
+                         }
+                     }
+                 }
+                 unstable {
+                     warnError('missing test xml files') {
+                         script {
 -                            copyTestResults('cqlsh-test')
++                          copyTestResults('cqlsh-tests')
+                         }
+                     }
+                 }
+               }
+             }
 -          }
 -      }
 -      stage('Distributed Test') {
 -          parallel {
 -            stage('dtest') {
 -              steps {
 -                  warnError('Tests unstable') {
 -                    build job: "${env.JOB_NAME}-dtest"
++        }
++    }
++    stage('Distributed Test') {
++        parallel {
++          stage('dtest') {
++            steps {
++                warnError('Tests unstable') {
++                  build job: "${env.JOB_NAME}-dtest"
++                }
++            }
++            post {
++              success {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest')
++                      }
+                   }
+               }
 -              post {
 -                success {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest')
 -                        }
 -                    }
 -                }
 -                unstable {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest')
 -                        }
 -                    }
 -                }
++              unstable {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest')
++                      }
++                  }
+               }
+             }
 -            stage('dtest-large') {
 -              steps {
 -                  warnError('Tests unstable') {
 -                    build job: "${env.JOB_NAME}-dtest-large"
++          }
++          stage('dtest-large') {
++            steps {
++                warnError('Tests unstable') {
++                  build job: "${env.JOB_NAME}-dtest-large"
++                }
++            }
++            post {
++              success {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-large')
++                      }
+                   }
+               }
 -              post {
 -                success {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-large')
 -                        }
 -                    }
 -                }
 -                unstable {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-large')
 -                        }
 -                    }
 -                }
++              unstable {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-large')
++                      }
++                  }
+               }
+             }
 -            stage('dtest-novnode') {
 -              steps {
 -                  warnError('Tests unstable') {
 -                    build job: "${env.JOB_NAME}-dtest-novnode"
++          }
++          stage('dtest-novnode') {
++            steps {
++                warnError('Tests unstable') {
++                  build job: "${env.JOB_NAME}-dtest-novnode"
++                }
++            }
++            post {
++              success {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-novnode')
++                      }
+                   }
+               }
 -              post {
 -                success {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-novnode')
 -                        }
 -                    }
 -                }
 -                unstable {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-novnode')
 -                        }
 -                    }
 -                }
++              unstable {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-novnode')
++                      }
++                  }
+               }
+             }
 -            stage('dtest-offheap') {
 -              steps {
 -                  warnError('Tests unstable') {
 -                    build job: "${env.JOB_NAME}-dtest-offheap"
++          }
++          stage('dtest-offheap') {
++            steps {
++                warnError('Tests unstable') {
++                  build job: "${env.JOB_NAME}-dtest-offheap"
++                }
++            }
++            post {
++              success {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-offheap')
++                      }
+                   }
+               }
 -              post {
 -                success {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-offheap')
 -                        }
 -                    }
 -                }
 -                unstable {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('dtest-offheap')
 -                        }
 -                    }
 -                }
++              unstable {
++                  warnError('missing test xml files') {
++                      script {
++                          copyTestResults('dtest-offheap')
++                      }
++                  }
+               }
+             }
+           }
 -      }
 -      stage('Summary') {
 -        steps {
 -            junit '**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml'
++        }
++    }
++    stage('Summary') {
++      steps {
++          junit '**/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`
 -            warnError('cannot send notifications') {
++          // the following should fail on any installation other than builds.apache.org
++          //  TODO: keep jenkins infrastructure related settings in `cassandra_job_dsl_seed.groovy`
++          warnError('cannot send notifications') {
+               slackSend channel: '#cassandra-builds', message: "${currentBuild.fullDisplayName} completed: ${currentBuild.result}. See ${env.BUILD_URL}"
+               emailext to: 'builds@cassandra.apache.org', subject: "Build complete: ${currentBuild.fullDisplayName} [${currentBuild.result}] ${env.GIT_COMMIT}", body: '${CHANGES}  ${JELLY_SCRIPT,template="text"}'
 -            }
++          }
+       }
++    }
+   }
+ }
+ 
+ def copyTestResults(target) {
+     step([$class: 'CopyArtifact',
+             projectName: "${env.JOB_NAME}-${target}",
+             optional: true,
+             fingerprintArtifacts: true,
+             selector: [$class: 'StatusBuildSelector', stable: false],
+             target: target]);
+ }


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