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 8d94618 ninja-fix docker scritps calls
8d94618 is described below
commit 8d94618223a4b1b88d7379b6e7f81ea049cd696a
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu Apr 1 21:28:34 2021 +0200
ninja-fix docker scritps calls
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index bd1d16d..8e4ae54 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -454,7 +454,7 @@ cassandraBranches.each {
}
steps {
shell("""
- sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest.sh apache ${branchName}
${buildsRepo} ${buildsBranch} ${testDockerImage} ${targetName}
\${split}/${splits} ;
+ sh
./cassandra-builds/build-scripts/cassandra-test-docker.sh apache ${branchName}
${buildsRepo} ${buildsBranch} ${testDockerImage} ${targetName}
\${split}/${testSplits} ;
./cassandra-builds/build-scripts/cassandra-test-report.sh ;
xz TESTS-TestSuites.xml
""")
@@ -549,7 +549,7 @@ cassandraBranches.each {
""")
}
shell("""
- sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest.sh apache ${branchName}
https://github.com/apache/cassandra-dtest.git trunk ${buildsRepo}
${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits} ;
+ sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest-docker.sh apache
${branchName} https://github.com/apache/cassandra-dtest.git trunk ${buildsRepo}
${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits} ;
""")
}
publishers {
@@ -848,7 +848,7 @@ testTargets.each {
echo "Cassandra-devbranch-${targetName}) cassandra: `git
log -1 --pretty=format:'%h %an %ad %s'`" >
Cassandra-devbranch-${targetName}.head
""")
shell("""
- sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest.sh ${REPO} ${BRANCH}
${buildsRepo} ${buildsBranch} ${testDockerImage} ${targetName}
\${split}/${splits} ;
+ sh
./cassandra-builds/build-scripts/cassandra-test-docker.sh \${REPO} \${BRANCH}
${buildsRepo} ${buildsBranch} ${testDockerImage} ${targetName}
\${split}/${testSplits} ;
./cassandra-builds/build-scripts/cassandra-test-report.sh ;
xz TESTS-TestSuites.xml
""")
@@ -985,7 +985,7 @@ archs.each {
""")
}
shell("""
- sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest.sh \$REPO \$BRANCH
\$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch} \$DOCKER_IMAGE
${targetName} \${split}/${splits} ;
+ sh
./cassandra-builds/build-scripts/cassandra-dtest-pytest-docker.sh \$REPO
\$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch}
\$DOCKER_IMAGE ${targetName} \${split}/${splits} ;
""")
}
publishers {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
