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 1ad64e2 ninja-fix: branchName cannot be in
Cassandra-template-cqlsh-tests, move to job branch implementations
1ad64e2 is described below
commit 1ad64e2660e94366a3ae52fbcaf7531248a85498
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Aug 9 22:32:11 2021 +0200
ninja-fix: branchName cannot be in Cassandra-template-cqlsh-tests, move to
job branch implementations
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 0ca8842..8819584 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -346,15 +346,6 @@ matrixJob('Cassandra-template-cqlsh-tests') {
}
}
}
- steps {
- buildDescription('', buildDescStr)
- shell("""
- git clean -xdff ;
- ./cassandra-builds/build-scripts/cassandra-test-docker.sh apache
${branchName} ${buildsRepo} ${buildsBranch} ${testDockerImage} cqlsh-test ;
- echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h
%an %ad %s'`" > \${BUILD_TAG}.head ;
- wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log.xz || echo wget failed
- """)
- }
}
////////////////////////////////////////////////////////////
@@ -646,6 +637,15 @@ cassandraBranches.each {
publishTestStabilityData()
}
}
+ steps {
+ buildDescription('', buildDescStr)
+ shell("""
+ git clean -xdff ;
+
./cassandra-builds/build-scripts/cassandra-test-docker.sh apache ${branchName}
${buildsRepo} ${buildsBranch} ${testDockerImage} cqlsh-test ;
+ echo "\${BUILD_TAG}) cassandra: `git log -1
--pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ;
+ wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log.xz || echo wget failed
+ """)
+ }
postBuildTask {
// docker needs to (soon or later) prune its volumes too,
but that can only be done when the agent is idle
// if the agent is busy, just prune everything that is
older than maxJobHours
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
