From 9cbc644cde541ab6f98dbf89ca29c060de159e96 Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 14:57:31 -0700 Subject: [PATCH 1/6] Remove some bloat from Docker test scripts Signed-off-by: Anna Rift --- util/cron/docker-chapel.bash | 33 ++------------------------------- util/cron/docker-gasnet.bash | 33 +-------------------------------- util/cron/test-docker.bash | 3 --- 3 files changed, 3 insertions(+), 66 deletions(-) diff --git a/util/cron/docker-chapel.bash b/util/cron/docker-chapel.bash index d05a1253b631..79d03467a360 100755 --- a/util/cron/docker-chapel.bash +++ b/util/cron/docker-chapel.bash @@ -1,38 +1,9 @@ #!/usr/bin/env bash -#This script will compile and execute helloworld inside a docker image and check if chapel is installed correctly -# Check if chapel is installed correctly -which chpl -if [ $? -ne 0 ] -then - echo "which chpl failed inside chapel container" - exit 1 -fi +set -exuo pipefail +which chpl chpl --version -if [ $? -ne 0 ] -then - echo "chpl --version failed inside chapel container" - exit 1 -fi - - -# Compile and execute chapel hello echo 'writeln("Hello, world!");' > hello.chpl chpl -o hello hello.chpl -if [ $? -ne 0 ] -then - echo "hello.chpl compile failed inside chapel container" - exit 1 -else - echo "hello.chpl compiled inside chapel container" -fi - ./hello -if [ $? -ne 0 ] -then - echo "./hello failed inside chapel container" - exit 1 -else - echo "./hello succeeded inside chapel container" -fi diff --git a/util/cron/docker-gasnet.bash b/util/cron/docker-gasnet.bash index 91687d3ab9f8..0dba915a4fb3 100755 --- a/util/cron/docker-gasnet.bash +++ b/util/cron/docker-gasnet.bash @@ -1,40 +1,9 @@ #!/usr/bin/env bash -# This script will compile and execute hello world inside a docker-gasnet and docker-gasnet-smp container(s) and check if chapel is installed +set -exuo pipefail -#check chpl install inside chapel(gasnet/gasnet-smp) container which chpl -if [ $? -ne 0 ] -then - echo "which chpl failed inside chapel container" - exit 1 -fi - chpl --version -if [ $? -ne 0 ] -then - echo "chpl --version failed inside chapel container" - exit 1 -fi - - -# Compile and execute chapel hello inside the container echo 'writeln("Hello, world!");' > hello.chpl chpl -o hello hello.chpl -if [ $? -ne 0 ] -then - echo "hello.chpl compile failed inside chapel container" - exit 1 -else - echo "hello.chpl compiled inside chapel container" -fi - ./hello -nl 1 -if [ $? -ne 0 ] -then - echo "./hello -nl 1 failed inside chapel gasnet container" - exit 1 -else - echo "./hello -nl 1 succeeded inside chapel gasnet container" -fi - diff --git a/util/cron/test-docker.bash b/util/cron/test-docker.bash index 7dd069864410..96a977624fdb 100755 --- a/util/cron/test-docker.bash +++ b/util/cron/test-docker.bash @@ -97,11 +97,8 @@ update_image() { fi # Run test script inside container - echo 'writeln("Hello, world!");' > hello.chpl docker run --rm -i "$imageName" < "$script" CONTAINER_RUN=$? - # Clean up scratch chpl file for testing - rm hello.chpl if [ $CONTAINER_RUN -ne 0 ] then From 8651d253c88c2b80a6d41e6523622092e3d0ffd1 Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 14:59:22 -0700 Subject: [PATCH 2/6] Move Docker test scripts from cron to packaging/docker/test Signed-off-by: Anna Rift --- util/cron/test-docker.bash | 6 +++--- util/{cron => packaging/docker/test}/docker-chapel.bash | 0 util/{cron => packaging/docker/test}/docker-gasnet.bash | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename util/{cron => packaging/docker/test}/docker-chapel.bash (100%) rename util/{cron => packaging/docker/test}/docker-gasnet.bash (100%) diff --git a/util/cron/test-docker.bash b/util/cron/test-docker.bash index 96a977624fdb..5d3a71ed17e2 100755 --- a/util/cron/test-docker.bash +++ b/util/cron/test-docker.bash @@ -118,17 +118,17 @@ update_all_images() { local release_tag="$1" cd "$CHPL_HOME" - update_image chapel/chapel "${CHPL_HOME}/util/cron/docker-chapel.bash" "$release_tag" + update_image chapel/chapel "$CHPL_HOME/util/packaging/docker/test/docker-chapel.bash" "$release_tag" cd "$CHPL_HOME/util/packaging/docker/gasnet" dockerfile_nightly_patch - update_image chapel/chapel-gasnet "${CHPL_HOME}/util/cron/docker-gasnet.bash" "$release_tag" + update_image chapel/chapel-gasnet "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" # Clean up after patch changes dockerfile_nightly_patch -R cd "$CHPL_HOME/util/packaging/docker/gasnet-smp" dockerfile_nightly_patch - update_image chapel/chapel-gasnet-smp "${CHPL_HOME}/util/cron/docker-gasnet.bash" "$release_tag" + update_image chapel/chapel-gasnet-smp "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" # Clean up after patch changes dockerfile_nightly_patch -R } diff --git a/util/cron/docker-chapel.bash b/util/packaging/docker/test/docker-chapel.bash similarity index 100% rename from util/cron/docker-chapel.bash rename to util/packaging/docker/test/docker-chapel.bash diff --git a/util/cron/docker-gasnet.bash b/util/packaging/docker/test/docker-gasnet.bash similarity index 100% rename from util/cron/docker-gasnet.bash rename to util/packaging/docker/test/docker-gasnet.bash From 6d82638c7d35d38c29a63dbc9222ec4764ecd91b Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 14:59:46 -0700 Subject: [PATCH 3/6] Remove obvious comment Signed-off-by: Anna Rift --- util/cron/test-docker.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/util/cron/test-docker.bash b/util/cron/test-docker.bash index 5d3a71ed17e2..353b2114eb6f 100755 --- a/util/cron/test-docker.bash +++ b/util/cron/test-docker.bash @@ -123,13 +123,11 @@ update_all_images() { cd "$CHPL_HOME/util/packaging/docker/gasnet" dockerfile_nightly_patch update_image chapel/chapel-gasnet "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" - # Clean up after patch changes dockerfile_nightly_patch -R cd "$CHPL_HOME/util/packaging/docker/gasnet-smp" dockerfile_nightly_patch update_image chapel/chapel-gasnet-smp "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" - # Clean up after patch changes dockerfile_nightly_patch -R } # END FUNCTIONS From 73c355fed3a520c22f97ffdbbdc9b3a5e5523e4d Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 15:01:00 -0700 Subject: [PATCH 4/6] Add chapel-gasnet-udp Dockerfile Signed-off-by: Anna Rift --- util/packaging/docker/gasnet-udp/Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 util/packaging/docker/gasnet-udp/Dockerfile diff --git a/util/packaging/docker/gasnet-udp/Dockerfile b/util/packaging/docker/gasnet-udp/Dockerfile new file mode 100644 index 000000000000..8107d224cdf8 --- /dev/null +++ b/util/packaging/docker/gasnet-udp/Dockerfile @@ -0,0 +1,12 @@ +FROM chapel/chapel:latest + +ARG MAKE_THREADS=1 + +ENV CHPL_COMM=gasnet +ENV CHPL_COMM_SUBSTRATE=udp +ENV CHPL_LAUNCHER=amudprun + +RUN CHPL_TARGET_COMPILER=llvm make -j$MAKE_THREADS -C $CHPL_HOME +RUN CHPL_TARGET_COMPILER=gnu make -j$MAKE_THREADS -C $CHPL_HOME +RUN make -j$MAKE_THREADS -C $CHPL_HOME chpldoc test-venv mason +RUN make -j$MAKE_THREADS -C $CHPL_HOME cleanall From f049ee90cd78074265b258017fdd27571f8e4cdd Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 15:01:21 -0700 Subject: [PATCH 5/6] Add chapel-gasnet-udp to test-docker Signed-off-by: Anna Rift --- util/cron/test-docker.bash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/cron/test-docker.bash b/util/cron/test-docker.bash index 353b2114eb6f..6350730e3218 100755 --- a/util/cron/test-docker.bash +++ b/util/cron/test-docker.bash @@ -129,6 +129,11 @@ update_all_images() { dockerfile_nightly_patch update_image chapel/chapel-gasnet-smp "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" dockerfile_nightly_patch -R + + cd "$CHPL_HOME/util/packaging/docker/gasnet-udp" + dockerfile_nightly_patch + update_image chapel/chapel-gasnet-udp "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag" + dockerfile_nightly_patch -R } # END FUNCTIONS From ef54f8d6d981a72a1e1208aa701c3213fc1c2c4c Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 1 May 2026 15:08:04 -0700 Subject: [PATCH 6/6] Invoke ./hello -nl 2 in addition to -nl 1 Signed-off-by: Anna Rift --- util/packaging/docker/test/docker-gasnet.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/util/packaging/docker/test/docker-gasnet.bash b/util/packaging/docker/test/docker-gasnet.bash index 0dba915a4fb3..bd36627fd373 100755 --- a/util/packaging/docker/test/docker-gasnet.bash +++ b/util/packaging/docker/test/docker-gasnet.bash @@ -7,3 +7,4 @@ chpl --version echo 'writeln("Hello, world!");' > hello.chpl chpl -o hello hello.chpl ./hello -nl 1 +./hello -nl 2