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/10/27 09:54:35 UTC
[cassandra-builds] branch trunk updated: Rename master branch to
trunk in cassandra-dtest
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-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9a4a4eb Rename master branch to trunk in cassandra-dtest
9a4a4eb is described below
commit 9a4a4eb0a1ec8b39cb1d27d7476d2fd617d1402a
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sun Oct 25 14:12:36 2020 +0100
Rename master branch to trunk in cassandra-dtest
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16166
---
docker/testing/ubuntu1810_j11.docker | 2 +-
docker/testing/ubuntu18_j11.docker | 2 +-
docker/testing/ubuntu1910_j11.docker | 2 +-
jenkins-dsl/cassandra_job_dsl_seed.groovy | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker/testing/ubuntu1810_j11.docker b/docker/testing/ubuntu1810_j11.docker
index 58fea47..07d68ba 100644
--- a/docker/testing/ubuntu1810_j11.docker
+++ b/docker/testing/ubuntu1810_j11.docker
@@ -43,7 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
# as we only need the requirements.txt file from the dtest repo, let's just get it from GitHub as a raw asset
# so we can avoid needing to clone the entire repo just to get this file
-ADD https://raw.githubusercontent.com/apache/cassandra-dtest/master/requirements.txt /opt
+ADD https://raw.githubusercontent.com/apache/cassandra-dtest/trunk/requirements.txt /opt
RUN chmod 0644 /opt/requirements.txt
# now setup python via virtualenv with all of the python dependencies we need according to requirements.txt
diff --git a/docker/testing/ubuntu18_j11.docker b/docker/testing/ubuntu18_j11.docker
index 3e6fe6b..88a80d6 100644
--- a/docker/testing/ubuntu18_j11.docker
+++ b/docker/testing/ubuntu18_j11.docker
@@ -43,7 +43,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
# as we only need the requirements.txt file from the dtest repo, let's just get it from GitHub as a raw asset
# so we can avoid needing to clone the entire repo just to get this file
-ADD https://raw.githubusercontent.com/apache/cassandra-dtest/master/requirements.txt /opt
+ADD https://raw.githubusercontent.com/apache/cassandra-dtest/trunk/requirements.txt /opt
RUN chmod 0644 /opt/requirements.txt
# now setup python via virtualenv with all of the python dependencies we need according to requirements.txt
diff --git a/docker/testing/ubuntu1910_j11.docker b/docker/testing/ubuntu1910_j11.docker
index 70dd44b..e56ac5c 100644
--- a/docker/testing/ubuntu1910_j11.docker
+++ b/docker/testing/ubuntu1910_j11.docker
@@ -55,7 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
# as we only need the requirements.txt file from the dtest repo, let's just get it from GitHub as a raw asset
# so we can avoid needing to clone the entire repo just to get this file
-ADD https://raw.githubusercontent.com/apache/cassandra-dtest/master/requirements.txt /opt
+ADD https://raw.githubusercontent.com/apache/cassandra-dtest/trunk/requirements.txt /opt
RUN chmod 0644 /opt/requirements.txt
# now setup python via virtualenv with all of the python dependencies we need according to requirements.txt
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index e55d339..7e20c5d 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -520,7 +520,7 @@ cassandraBranches.each {
}
steps {
shell("""
- sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName} https://github.com/apache/cassandra-dtest.git master ${buildsRepo} ${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits} ;
+ sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName} https://github.com/apache/cassandra-dtest.git trunk ${buildsRepo} ${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits} ;
xz test_stdout.txt
""")
}
@@ -790,7 +790,7 @@ dtestTargets.each {
stringParam('REPO', 'apache', 'The github user/org to clone cassandra repo from')
stringParam('BRANCH', 'trunk', 'The branch of cassandra to checkout')
stringParam('DTEST_REPO', "${dtestRepo}", 'The cassandra-dtest repo URL')
- stringParam('DTEST_BRANCH', 'master', 'The branch of cassandra-dtest to checkout')
+ stringParam('DTEST_BRANCH', 'trunk', 'The branch of cassandra-dtest to checkout')
stringParam('DOCKER_IMAGE', "${dtestDockerImage}", 'Docker image for running dtests')
}
axes {
@@ -895,7 +895,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
stringParam('REPO', 'apache', 'The github user/org to clone cassandra repo from')
stringParam('BRANCH', 'trunk', 'The branch of cassandra to checkout')
stringParam('DTEST_REPO', "${dtestRepo}", 'The cassandra-dtest repo URL')
- stringParam('DTEST_BRANCH', 'master', 'The branch of cassandra-dtest to checkout')
+ stringParam('DTEST_BRANCH', 'trunk', 'The branch of cassandra-dtest to checkout')
}
axes {
text('cython', 'yes', 'no')
@@ -966,7 +966,7 @@ pipelineJob('Cassandra-devbranch') {
stringParam('REPO', 'apache', 'The github user/org to clone cassandra repo from')
stringParam('BRANCH', 'trunk', 'The branch of cassandra to checkout')
stringParam('DTEST_REPO', "${dtestRepo}", 'The cassandra-dtest repo URL')
- stringParam('DTEST_BRANCH', 'master', 'The branch of cassandra-dtest to checkout')
+ stringParam('DTEST_BRANCH', 'trunk', 'The branch of cassandra-dtest to checkout')
stringParam('DOCKER_IMAGE', "${dtestDockerImage}", 'Docker image for running dtests')
}
properties {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org