You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/04/03 20:39:12 UTC
[cassandra-builds] branch trunk updated: Fixes for arm64 and
print-shas (INFRA-21619)
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 564803a Fixes for arm64 and print-shas (INFRA-21619)
564803a is described below
commit 564803af8cb02375f2060ec6403bf4572c6bdbf8
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Sat Apr 3 22:38:05 2021 +0200
Fixes for arm64 and print-shas (INFRA-21619)
---
build-scripts/cassandra-dtest-pytest-docker.sh | 2 +-
jenkins-dsl/cassandra_job_dsl_seed.groovy | 2 +-
jenkins-dsl/print-shas.sh | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build-scripts/cassandra-dtest-pytest-docker.sh b/build-scripts/cassandra-dtest-pytest-docker.sh
index 5a2291c..c934861 100644
--- a/build-scripts/cassandra-dtest-pytest-docker.sh
+++ b/build-scripts/cassandra-dtest-pytest-docker.sh
@@ -43,7 +43,7 @@ DTEST_REPO=$3
DTEST_BRANCH=$4
EOF
- echo "cassandra-dtest-pytest.sh: running: git clone --single-branch --depth 1 --branch $BUILDSBRANCH $BUILDSREPO; sh ./cassandra-builds/build-scripts/cassandra-dtest-pytest.sh $TARGET $SPLIT_CHUNK"
+ echo "cassandra-dtest-pytest-docker.sh: running: git clone --single-branch --depth 1 --branch $BUILDSBRANCH $BUILDSREPO; sh ./cassandra-builds/build-scripts/cassandra-dtest-pytest-docker.sh $TARGET $SPLIT_CHUNK"
ID=$(docker run -m 15g --memory-swap 15g --env-file env.list -dt $DOCKER_IMAGE dumb-init bash -ilc "git clone --single-branch --depth 1 --branch $BUILDSBRANCH $BUILDSREPO; sh ./cassandra-builds/build-scripts/cassandra-dtest-pytest-docker.sh $TARGET $SPLIT_CHUNK")
# use docker attach instead of docker wait to get output
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 8e4ae54..82fbe29 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -545,7 +545,7 @@ cassandraBranches.each {
shell("""
# docker image has to be built on arm64 (they are not currently published to dockerhub)
cd cassandra-builds/docker/testing ;
- docker build -t \$DOCKER_IMAGE:latest -f ubuntu2004_j11.docker .
+ docker build -t ${dtestDockerImage}:latest -f ubuntu2004_j11.docker .
""")
}
shell("""
diff --git a/jenkins-dsl/print-shas.sh b/jenkins-dsl/print-shas.sh
index c2d6eec..51bd820 100755
--- a/jenkins-dsl/print-shas.sh
+++ b/jenkins-dsl/print-shas.sh
@@ -4,10 +4,10 @@
# If they all match then print just them, else print every job's used SHA
#
-if [ $(find . -type f -name "*.head" -exec cat {} \; | grep ") cassandra" | sort -k4 | uniq -f3 | sed -n '$=') = "3" ]; then
+if [ $(find . -type f -name "*.head" -exec cat {} \; | grep ") cassandra" | awk -F') cassandra' '{print $2}' | sort -u | sed -n '$=') = "3" ]; then
echo "The folllowing SHAs were consistently used in all jobs in the pipeline…"
- find . -type f -name "*.head" -exec cat {} \; | grep ") cassandra" | awk '{$1=$2=$3=""; print $0}' | sort -u
+ find . -type f -name "*.head" -exec cat {} \; | grep ") cassandra" | awk -F') cassandra' '{print "cassandra"$2}' | sort -u
else
- echo "Different SHAs were used in different jobs in the pipeline. Printing everything…"
+ echo "$(find . -type f -name "*.head" -exec cat {} \; | grep ") cassandra" | awk -F') cassandra' '{print $2}' | sort -u | sed -n '$=') different SHAs were used in different jobs in the pipeline. Printing everything…"
find . -type f -name "*.head" -exec cat {} \;
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org