This is an automated email from the ASF dual-hosted git repository. azotcsit pushed a commit to branch revert-63-cassandra-16630_ant_version in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
commit 6425517cd03597bae8500a7679658900dacd7dff Author: Aleksei Zotov <[email protected]> AuthorDate: Sun Feb 20 21:07:44 2022 +0400 Revert "Updated ant to 1.10.12 for cassandra-artifacts build" This reverts commit aabc8465be2cda24268f1dc93b2c35bd018160c2. --- jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 ++++++++++++------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index 256e9ef..94197d0 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -392,15 +392,11 @@ cassandraBranches.each { node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) } steps { - // 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 - """) - } + 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 { @@ -832,18 +828,14 @@ matrixJob('Cassandra-devbranch-artifacts') { } steps { buildDescription('', buildDescStr) - // 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 - """) - } + 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: [email protected] For additional commands, e-mail: [email protected]
