Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions util/cron/docker-chapel.bash

This file was deleted.

40 changes: 0 additions & 40 deletions util/cron/docker-gasnet.bash

This file was deleted.

16 changes: 8 additions & 8 deletions util/cron/test-docker.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -121,18 +118,21 @@ 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"
# Clean up after patch changes
update_image chapel/chapel-gasnet "$CHPL_HOME/util/packaging/docker/test/docker-gasnet.bash" "$release_tag"
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"
# Clean up after patch changes
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
Expand Down
12 changes: 12 additions & 0 deletions util/packaging/docker/gasnet-udp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions util/packaging/docker/test/docker-chapel.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -exuo pipefail

which chpl
chpl --version
echo 'writeln("Hello, world!");' > hello.chpl
chpl -o hello hello.chpl
./hello
10 changes: 10 additions & 0 deletions util/packaging/docker/test/docker-gasnet.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

set -exuo pipefail

which chpl
chpl --version
echo 'writeln("Hello, world!");' > hello.chpl
chpl -o hello hello.chpl
./hello -nl 1
./hello -nl 2
Loading