This is an automated email from the ASF dual-hosted git repository.
azotcsit 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 aabc846 Updated ant to 1.10.12 for cassandra-artifacts build
aabc846 is described below
commit aabc8465be2cda24268f1dc93b2c35bd018160c2
Author: Aleksei Zotov <azotc...@gmail.com>
AuthorDate: Thu Feb 17 22:31:32 2022 +0400
Updated ant to 1.10.12 for cassandra-artifacts build
patch by Aleksei Zotov; reviewed by Mick Semb Wever for CASSANDRA-16630
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 +++++++++++++++++++------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 94197d0..256e9ef 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -392,11 +392,15 @@ cassandraBranches.each {
node / scm / branches / 'hudson.plugins.git.BranchSpec' /
name(branchName)
}
steps {
- shell("""
- ./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
- wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log || echo wget failed ;
- xz console.log
- """)
+ // cassandra-artifacts.sh script is the only place where ant is
called directly. In all other places ant is
+ // called inside a docker container, so there is no need to
specify version in the pipeline script.
+ withAnt (installation: 'ant_1.10.12') {
+ shell("""
+
./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+ wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log || echo wget failed ;
+ xz console.log
+ """)
+ }
}
publishers {
publishOverSsh {
@@ -828,14 +832,18 @@ matrixJob('Cassandra-devbranch-artifacts') {
}
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'`" ;
- ./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
- wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log || echo wget failed ;
- xz console.log
- """)
+ // cassandra-artifacts.sh script is the only place where ant is called
directly. In all other places ant is
+ // called inside a docker container, so there is no need to specify
version in the pipeline script.
+ withAnt (installation: 'ant_1.10.12') {
+ 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'`" ;
+ ./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+ wget --retry-connrefused --waitretry=1
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - >
console.log || echo wget failed ;
+ xz console.log
+ """)
+ }
}
publishers {
publishOverSsh {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
