From 5d269807778534fc4eaabdfbc90cd34f8927d968 Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Sun, 25 Oct 2020 15:26:14 +0100 Subject: [PATCH] Rename master branch to trunk in cassandra-dtest patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16166 --- .circleci/config-2_1.yml | 2 +- .circleci/config.yml | 16 ++++++++-------- .circleci/config.yml.HIGHRES | 16 ++++++++-------- .circleci/config.yml.LOWRES | 16 ++++++++-------- .jenkins/Jenkinsfile | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index e90ef4a82c..79332a8740 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -13,7 +13,7 @@ default_env_vars: &default_env_vars #Skip all syncing to disk to avoid performance issues in flaky CI environments CASSANDRA_SKIP_SYNC: true DTEST_REPO: git://github.com/apache/cassandra-dtest.git - DTEST_BRANCH: master + DTEST_BRANCH: trunk CCM_MAX_HEAP_SIZE: 1024M CCM_HEAP_NEWSIZE: 256M diff --git a/.circleci/config.yml b/.circleci/config.yml index d5efe4fb29..0997d8a44c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,7 +70,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -159,7 +159,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -248,7 +248,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -291,7 +291,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -380,7 +380,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -438,7 +438,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -496,7 +496,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -595,7 +595,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index 77a396d716..64e2e74499 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -70,7 +70,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -159,7 +159,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -248,7 +248,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -291,7 +291,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -380,7 +380,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -438,7 +438,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -496,7 +496,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -595,7 +595,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 2048M - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index d5efe4fb29..0997d8a44c 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -70,7 +70,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -159,7 +159,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -248,7 +248,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -291,7 +291,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -380,7 +380,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -438,7 +438,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -496,7 +496,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 @@ -595,7 +595,7 @@ jobs: - CASS_DRIVER_NO_CYTHON: true - CASSANDRA_SKIP_SYNC: true - DTEST_REPO: git://github.com/apache/cassandra-dtest.git - - DTEST_BRANCH: master + - DTEST_BRANCH: trunk - CCM_MAX_HEAP_SIZE: 1024M - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 09930eec1a..aef9661092 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -18,7 +18,7 @@ // // 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 +// https://github.com/apache/cassandra-builds/blob/trunk/jenkins-dsl/cassandra_job_dsl_seed.groovy // // Validate/lint this file using the following command // `curl -X POST -F "jenkinsfile=<.jenkins/Jenkinsfile" https://ci-cassandra.apache.org/pipeline-model-converter/validate`