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/06/24 10:22:47 UTC

[cassandra] branch trunk updated (b85ede6 -> 853b599)

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 b85ede6  generateSplits method replaced the generateRandomTokens for ReplicationAwareTokenAllocator.
     new 6df467a  Improvements and fixes to Jenkinsfile  - Fix slack changelog message. currentBuild.changeSets is an array and has to first be formatted.  - Remove cassandra-build directory in Summary stage, so 'Restart from Stage' builds work,  - Archive the cassandra-test-report.txt artifact  - Add StabilityTestDataPublisher to the pipeline junit results (provides flakey info)
     new 461dce2  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 9551d4b  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 853b599  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          | 26 ++++++++++++++++++++++++--
 doc/source/development/ci.rst |  2 ++
 2 files changed, 26 insertions(+), 2 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 853b5993372923776cf39f200ca8417dd6128830
Merge: b85ede6 9551d4b
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Jun 24 12:16:59 2020 +0200

    Merge branch 'cassandra-3.11' into trunk

 .jenkins/Jenkinsfile          | 26 ++++++++++++++++++++++++--
 doc/source/development/ci.rst |  2 ++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --cc .jenkins/Jenkinsfile
index d393036,bb828e3..586c048
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -338,12 -318,12 +338,13 @@@ pipeline 
              }
            }
          }
 +    }
      stage('Summary') {
        steps {
+           sh "rm -fR cassandra-builds"
            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'
+           junit testResults: '**/build/test/**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
  
            // the following should fail on any installation other than builds.apache.org
            //  TODO: keep jenkins infrastructure related settings in `cassandra_job_dsl_seed.groovy`
diff --cc doc/source/development/ci.rst
index a6620b3,0000000..d7a1bb6
mode 100644,000000..100644
--- a/doc/source/development/ci.rst
+++ b/doc/source/development/ci.rst
@@@ -1,79 -1,0 +1,81 @@@
 +.. 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
 +..
 +..     http://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 CI Environment
 +**********************
 +
 +About CI testing and Apache Cassandra
 +=====================================
 +
 +Cassandra can be automatically tested using various test suites, that are either implemented based on JUnit or the `dtest <https://github.com/riptano/cassandra-dtest>`_ scripts written in Python. As outlined in :doc:`testing`, each kind of test suite addresses a different way how to test Cassandra. But in the end, all of them will be executed together on our CI platform at `builds.apache.org <https://builds.apache.org>`_, running `Jenkins <http://jenkins-ci.org>`_.
 +
 +
 +
 +Setting up your own Jenkins server
 +==================================
 +
 +Jenkins is an open source solution that can be installed on a large number of platforms. Setting up a custom Jenkins instance for Cassandra may be desirable for users who have hardware to spare, or organizations that want to run Cassandra tests for custom patches before contribution.
 +
 +Please refer to the Jenkins download and documentation pages for details on how to get Jenkins running, possibly also including slave build executor instances. The rest of the document will focus on how to setup Cassandra jobs in your Jenkins environment.
 +
 +Required plugins
 +----------------
 +
 +The following plugins need to be installed additionally to the standard plugins (git, ant, ..).
 +
 +You can install any missing plugins through the install manager.
 +
 +Go to ``Manage Jenkins -> Manage Plugins -> Available`` and install the following plugins and respective dependencies:
 +
 +* Job DSL
 +* Javadoc Plugin
 +* description setter plugin
 +* Throttle Concurrent Builds Plug-in
 +* Test stability history
 +* Hudson Post build task
++* Slack Notification
++* Copy artifact
 +
 +
 +Configure Throttle Category
 +---------------------------
 +
 +Builds that are not containerized (e.g. cqlshlib tests and in-jvm dtests) use local resources for Cassandra (ccm). To prevent these builds running concurrently the ``Cassandra`` throttle category needs to be created.
 +
 +This is done under ``Manage Jenkins -> System Configuration -> Throttle Concurrent Builds``. Enter "Cassandra" for the ``Category Name`` and "1" for ``Maximum Concurrent Builds Per Node``.
 +
 +Setup seed job
 +--------------
 +
 +Config ``New Item``
 +
 +* Name it ``Cassandra-Job-DSL``
 +* Select ``Freestyle project``
 +
 +Under ``Source Code Management`` select Git using the repository: ``https://github.com/apache/cassandra-builds``
 +
 +Under ``Build``, confirm ``Add build step`` -> ``Process Job DSLs`` and enter at ``Look on Filesystem``: ``jenkins-dsl/cassandra_job_dsl_seed.groovy``
 +
 +Generated jobs will be created based on the Groovy script's default settings. You may want to override settings by checking ``This project is parameterized`` and add ``String Parameter`` for on the variables that can be found in the top of the script. This will allow you to setup jobs for your own repository and branches (e.g. working branches).
 +
 +**When done, confirm "Save"**
 +
 +You should now find a new entry with the given name in your project list. However, building the project will still fail and abort with an error message `"Processing DSL script cassandra_job_dsl_seed.groovy ERROR: script not yet approved for use"`. Goto ``Manage Jenkins`` -> ``In-process Script Approval`` to fix this issue. Afterwards you should be able to run the script and have it generate numerous new jobs based on the found branches and configured templates.
 +
 +Jobs are triggered by either changes in Git or are scheduled to execute periodically, e.g. on daily basis. Jenkins will use any available executor with the label "cassandra", once the job is to be run. Please make sure to make any executors available by selecting ``Build Executor Status`` -> ``Configure`` -> Add "``cassandra``" as label and save.
 +
 +Executors need to have "JDK 1.8 (latest)" installed. This is done under ``Manage Jenkins -> Global Tool Configuration -> JDK Installations…``. Executors also need to have the virtualenv package installed on their system.
 +


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