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 5a52a7e ninja-fix: branchName cannot be in
Cassandra-template-cqlsh-tests, move to job branch implementations
5a52a7e is described below
commit 5a52a7ef3392aa0f90bf4fa9947201bf71033c70
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Aug 9 23:07:51 2021 +0200
ninja-fix: branchName cannot be in Cassandra-template-cqlsh-tests, move to
job branch implementations
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 8819584..f7666a8 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -346,6 +346,15 @@ matrixJob('Cassandra-template-cqlsh-tests') {
}
}
}
+ steps {
+ buildDescription('', buildDescStr)
+ shell("""
+ git clean -xdff ;
+ git clone --depth 1 --single-branch -b ${buildsBranch}
${buildsRepo} ;
+ echo "cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`" ;
+ echo "\${BUILD_TAG}) cassandra: `git log -1
--pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head
+ """)
+ }
}
////////////////////////////////////////////////////////////
@@ -638,11 +647,8 @@ cassandraBranches.each {
}
}
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
""")
}
@@ -1131,6 +1137,8 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
shell("""
git clean -xdff ;
echo "\${BUILD_TAG}) cassandra: `git log -1
--pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ;
+ git clone --depth 1 --single-branch -b ${buildsBranch}
${buildsRepo} ;
+ echo "cassandra-builds at: `git -C cassandra-builds log -1
--pretty=format:'%h %an %ad %s'`" ;
./cassandra-builds/build-scripts/cassandra-test-docker.sh
\${REPO} \${BRANCH} ${buildsRepo} ${buildsBranch} ${testDockerImage} cqlsh-test
;
wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log.xz || echo wget failed
""")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
