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 8038186 Retry publishOverSsh to nightlies.a.o, and retry curl
ant-junit-..rpm command
8038186 is described below
commit 80381867de2218cffcf5444ecbeecb580e659e46
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu May 20 09:39:48 2021 +0200
Retry publishOverSsh to nightlies.a.o, and retry curl ant-junit-..rpm
command
patch by Mick Semb Wever; reviewed by Berenguer Blasi
---
docker/centos8-image.docker | 2 +-
jenkins-dsl/cassandra_job_dsl_seed.groovy | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/docker/centos8-image.docker b/docker/centos8-image.docker
index c605949..0d55d10 100644
--- a/docker/centos8-image.docker
+++ b/docker/centos8-image.docker
@@ -20,7 +20,7 @@ RUN yum -y install \
sudo \
python3-pip
-RUN curl -S -s --retry 9 --retry-connrefused --retry-delay 1
http://mirror.centos.org/centos/7/os/x86_64/Packages/ant-junit-1.9.4-2.el7.noarch.rpm
-o ant-junit-1.9.4-2.el7.noarch.rpm
+RUN until curl -S -s --retry 9 --retry-connrefused --retry-delay 1
http://mirror.centos.org/centos/7/os/x86_64/Packages/ant-junit-1.9.4-2.el7.noarch.rpm
-o ant-junit-1.9.4-2.el7.noarch.rpm ; do echo "curl failed… trying again… " ;
done
RUN rpm -i --nodeps ant-junit-1.9.4-2.el7.noarch.rpm
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 816a178..89ec118 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -407,6 +407,7 @@ cassandraBranches.each {
sourceFiles("console.log.xz,
build/apache-cassandra-*.tar.gz, build/apache-cassandra-*.jar,
build/apache-cassandra-*.pom, build/cassandra*.deb, build/cassandra*.rpm")
remoteDirectory("cassandra/${branchName}/${jobNamePrefix}-artifacts/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -496,6 +497,7 @@ cassandraBranches.each {
sourceFiles("console.log.xz,TESTS-TestSuites.xml.xz,build/test/logs/**,build/test/jmh-result.json")
remoteDirectory("cassandra/${branchName}/${jobNamePrefix}-${targetName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -579,6 +581,7 @@ cassandraBranches.each {
sourceFiles("console.log.xz,**/nosetests.xml,**/test_stdout.txt.xz,**/ccm_logs.tar.xz")
remoteDirectory("cassandra/${branchName}/${jobNamePrefix}-${targetArchName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -630,6 +633,7 @@ cassandraBranches.each {
sourceFiles("console.log.xz,**/cqlshlib.xml,**/*.head")
remoteDirectory("cassandra/${branchName}/${jobNamePrefix}-cqlsh-tests/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -783,6 +787,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
sourceFiles("console.log.xz,build/apache-cassandra-*.tar.gz,
build/apache-cassandra-*.jar, build/apache-cassandra-*.pom,
build/cassandra*.deb, build/cassandra*.rpm")
remoteDirectory("cassandra/devbranch/Cassandra-devbranch-artifacts/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -889,6 +894,7 @@ testTargets.each {
sourceFiles("TESTS-TestSuites.xml.xz,build/test/logs/**,build/test/jmh-result.json")
remoteDirectory("cassandra/devbranch/Cassandra-devbranch-${targetName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -1027,6 +1033,7 @@ archs.each {
sourceFiles("console.log.xz,**/nosetests.xml,**/test_stdout.txt.xz,**/ccm_logs.tar.xz")
remoteDirectory("cassandra/devbranch/Cassandra-devbranch-${targetArchName}/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
@@ -1134,6 +1141,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
sourceFiles("console.log.xz,**/test_stdout.txt.xz,**/ccm_logs.tar.xz")
remoteDirectory("cassandra/devbranch/Cassandra-devbranch-cqlsh-tests/\${BUILD_NUMBER}/\${JOB_NAME}/")
}
+ retry(9, 5000)
}
failOnError(false)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
