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

[cassandra] branch cassandra-3.11 updated (a7f50c9 -> 3f11261)

This is an automated email from the ASF dual-hosted git repository.

samt pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from a7f50c9  Fix HintsWriteThenReadTest and LongStreamingTest
     new 466c65a  Update to latest docker image for CircleCI
     new de85f43  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 3f11261  Merge branch 'cassandra-3.0' into cassandra-3.11

The 3 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:
 .circleci/config-2_1.yml     |  8 ++++----
 .circleci/config.yml         | 40 ++++++++++++++++++++--------------------
 .circleci/config.yml.HIGHRES | 40 ++++++++++++++++++++--------------------
 .circleci/config.yml.LOWRES  | 40 ++++++++++++++++++++--------------------
 4 files changed, 64 insertions(+), 64 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.0' into cassandra-3.11

Posted by sa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

samt pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 3f1126195aafb4a0142a1a2158dec39583e73c11
Merge: a7f50c9 de85f43
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Tue Dec 1 18:53:59 2020 +0000

    Merge branch 'cassandra-3.0' into cassandra-3.11

 .circleci/config-2_1.yml     |  8 ++++----
 .circleci/config.yml         | 40 ++++++++++++++++++++--------------------
 .circleci/config.yml.HIGHRES | 40 ++++++++++++++++++++--------------------
 .circleci/config.yml.LOWRES  | 40 ++++++++++++++++++++--------------------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --cc .circleci/config.yml
index b0db851,dda7046..c45f384
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -2,7 -2,7 +2,7 @@@ version: 
  jobs:
    j8_jvm_upgrade_dtests:
      docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
 -    - image: beobal/cassandra-testing-ubuntu1810-java11-w-dependencies:20201130
++    - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -330,55 -330,9 +330,55 @@@
      - CCM_HEAP_NEWSIZE: 256M
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  utests_stress:
 +    docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
++    - image: beobal/cassandra-testing-ubuntu1810-java11-w-dependencies:20201130
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run Unit Tests (stress-test)
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - ANT_HOME: /usr/share/ant
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
    j8_unit_tests:
      docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+     - image: beobal/cassandra-testing-ubuntu1810-java11-w-dependencies:20201130
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
diff --cc .circleci/config.yml.HIGHRES
index 834f046,cd52b72..cf18b13
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -330,55 -330,9 +330,55 @@@ jobs
      - CCM_HEAP_NEWSIZE: 512M
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  utests_stress:
 +    docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
++    - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130
 +    resource_class: xlarge
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run Unit Tests (stress-test)
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - ANT_HOME: /usr/share/ant
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 2048M
 +    - CCM_HEAP_NEWSIZE: 512M
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
    j8_unit_tests:
      docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+     - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130
      resource_class: xlarge
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
diff --cc .circleci/config.yml.LOWRES
index b0db851,d49ace5..027ccb8
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@@ -330,55 -330,9 +330,55 @@@ jobs
      - CCM_HEAP_NEWSIZE: 256M
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  utests_stress:
 +    docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
++    - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run Unit Tests (stress-test)
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - ANT_HOME: /usr/share/ant
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
    j8_unit_tests:
      docker:
-     - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+     - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l


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