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 4216e2e Remove arch conditionals in builds (need to be runtime
conditionals)
4216e2e is described below
commit 4216e2ebf9ca7c72da0f45fd46c91a7e056585d4
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu May 6 14:38:03 2021 +0200
Remove arch conditionals in builds (need to be runtime conditionals)
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 0d6a18e..3bebff3 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -466,14 +466,6 @@ cassandraBranches.each {
node / scm / branches / 'hudson.plugins.git.BranchSpec' /
name(branchName)
}
steps {
- if (arch == "-arm64") {
- shell("""
- # docker image has to be built on arm64 (they
are not currently published to dockerhub)
- cd cassandra-builds/docker/testing ;
- docker build -t ${dtestDockerImage}:latest -f
ubuntu2004_j11.docker . ;
- docker build -t ${testDockerImage}:latest -f
ubuntu2004_j11_w_dependencies.docker .
- """)
- }
shell("""
./cassandra-builds/build-scripts/cassandra-test-docker.sh apache ${branchName}
${buildsRepo} ${buildsBranch} ${testDockerImage} ${targetName}
\${split}/${testSplits} ;
./cassandra-builds/build-scripts/cassandra-test-report.sh ;
@@ -878,14 +870,6 @@ testTargets.each {
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'`" ;
""")
- if (arch == "-arm64") {
- shell("""
- # docker image has to be built on arm64 (they are not
currently published to dockerhub)
- cd cassandra-builds/docker/testing ;
- docker build -t ${dtestDockerImage}:latest -f
ubuntu2004_j11.docker . ;
- docker build -t ${testDockerImage}:latest -f
ubuntu2004_j11_w_dependencies.docker .
- """)
- }
shell("""
echo "Cassandra-devbranch-${targetName}) cassandra: `git
log -1 --pretty=format:'%h %an %ad %s'`" >
Cassandra-devbranch-${targetName}.head ;
./cassandra-builds/build-scripts/cassandra-test-docker.sh
\${REPO} \${BRANCH} ${buildsRepo} ${buildsBranch} ${testDockerImage}
${targetName} \${split}/${testSplits} ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
