Skip to content

Commit fd78a10

Browse files
committed
CI (Buildkite): add Pkg, Artifacts, and LazyArtifacts to the list of "network-related stdlibs" that we test in a separate Buildkite job
1 parent 707c57c commit fd78a10

File tree

5 files changed

+75
-44
lines changed

5 files changed

+75
-44
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS GROUP MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
linux 32 . 32 i686 . . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
3-
linux 64 . 64 x86_64 . . . . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
4-
# linux _aarch64 . _aarch64 aarch64 . . . . . . . . .... ........................................
5-
# linux _armv7l . _armv7l armv7l . . . . . . . . .... ........................................
6-
# linux _ppc64le . _ppc64le powerpc64le . . . . . . . . .... ........................................
7-
musl 64 . 64 x86_64 . . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 32 . . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
3+
linux 64 . . 64 x86_64 . . . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
4+
# linux aarch64 . . aarch64 aarch64 . . . . . . . .... ........................................
5+
# linux armv7l . . armv7l armv7l . . . . . . . .... ........................................
6+
# linux ppc64le . . ppc64le powerpc64le . . . . . . . .... ........................................
7+
musl 64 . . 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90
Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS GROUP MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 32_g1 g1 . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
3+
linux 32_g2 g2 . 32 i686 . . . 3 . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
24

3-
linux 32 . 32 i686 no-net . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
4-
linux 32_net . 32 i686 net . . . 3 . yes . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
5+
linux 64_g1_mt g1 . 64 x86_64 . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
6+
linux 64_g2_mt g2 . 64 x86_64 . . . 3 . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
57

6-
linux 64_rr . 64 x86_64 no-net . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
7-
linux 64_net . 64 x86_64 net . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
8-
linux 64_st . 64 x86_64 no-net . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
9-
linux 64_mt . 64 x86_64 no-net . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
8+
linux 64_g1_st g1 . 64 x86_64 . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
9+
linux 64_g2_st g2 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
1010

11-
# linux _aarch64 . _aarch64 aarch64 . . . . . . . . .... ........................................
12-
# linux _armv7l . _armv7l armv7l . . . . . . . . .... ........................................
13-
# linux _ppc64le . _ppc64le powerpc64le . . . . . . . . .... ........................................
14-
musl 64 true 64 x86_64 . . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90
11+
linux 64_g1_rrst g1 . 64 x86_64 . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
12+
linux 64_g2_rrst g2 . 64 x86_64 . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
13+
linux 64_g3_st g3 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
14+
15+
# linux aarch64_g1 g1 true aarch64 aarch64 . . . . . . . ---- ----------------------------------------
16+
# linux aarch64_g2 g2 true aarch64 aarch64 . . . . . . . ---- ----------------------------------------
17+
18+
# linux armv7l_g1 g1 true armv7l armv7l . . . . . . . ---- ----------------------------------------
19+
# linux armv7l_g2 g2 true armv7l armv7l . . . . . . . ---- ----------------------------------------
20+
21+
# linux ppc64le_g1 g1 true ppc64le powerpc64le . . . . . . . ---- ----------------------------------------
22+
# linux ppc64le_g2 g2 true ppc64le powerpc64le . . . . . . . ---- ----------------------------------------
23+
24+
musl 64_g1 g1 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90
25+
musl 64_g2 g2 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90

.buildkite/pipelines/main/platforms/tester_linux.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,30 @@ steps:
5656
echo "JULIA_CPU_THREADS is: $${JULIA_CPU_THREADS:?}"
5757
$${JULIA_BINARY:?} -e '@info "" Sys.CPU_THREADS'
5858
59-
echo "--- Set some environment variables in preparation for running the Julia test suite"
60-
unset JULIA_DEPOT_PATH
59+
echo "--- Set some environment variables"
6160
export OPENBLAS_NUM_THREADS=8
61+
unset JULIA_DEPOT_PATH
62+
unset JULIA_PKG_SERVER
63+
64+
export NETWORK_RELATED_TESTS="Artifacts Downloads download LazyArtifacts LibGit2/online Pkg"
6265
6366
if [[ "${GROUP?}" == "all" ]]; then
64-
export TESTS="all"
65-
elif [[ "${GROUP?}" == "net" ]]; then
66-
export TESTS="Downloads LibGit2 LibGit2/online download"
67-
elif [[ "${GROUP?}" == "no-net" ]]; then
68-
export TESTS="all --skip Downloads LibGit2/online download"
67+
export TESTS="all LibGit2/online --force-net"
68+
elif [[ "${GROUP?}" == "all_except_pkg" ]]; then
69+
export TESTS="all LibGit2/online --force-net --skip Pkg"
70+
elif [[ "${GROUP?}" == "g1" ]]; then
71+
# Group 1: ALL tests EXCEPT the network-related tests.
72+
export TESTS="all --force-net --skip $${NETWORK_RELATED_TESTS:?}"
73+
elif [[ "${GROUP?}" == "g2" ]]; then
74+
# Group 2: ONLY the network-related tests.
75+
# In Group 2, we use whatever the default setting is with regards to the Pkg server.
76+
export TESTS="$${NETWORK_RELATED_TESTS:?} --force-net"
77+
elif [[ "${GROUP?}" == "g3" ]]; then
78+
# Group 3: only Pkg.
79+
# In Group 3, we explicitly opt-out of the Pkg server.
80+
# The purpose of group 3 is to test the non-Pkg-server codepaths of Pkg.
81+
export TESTS="Pkg --force-net"
82+
export JULIA_PKG_SERVER=""
6983
else
7084
echo "Invalid value for GROUP: ${GROUP?}"
7185
exit 1
@@ -89,6 +103,7 @@ steps:
89103
export JULIA_NUM_THREADS=16
90104
fi
91105
106+
echo "--- Print the test group, list of test sets, and other useful environment variables"
92107
echo "JULIA_CMD_FOR_TESTS is: $${JULIA_CMD_FOR_TESTS:?}"
93108
echo "JULIA_NUM_THREADS is: $${JULIA_NUM_THREADS}" # Note: this environment variable might not be set
94109
echo "NCORES_FOR_TESTS is: $${NCORES_FOR_TESTS:?}"
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS GROUP MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
linux 64_no_bb . 64_no_bb x86_64 no-net . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
3-
linux 64_no_bb_net . 64_no_bb x86_64 net . 180 120 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
1+
# PLATFORM LABEL GROUP ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT_BK TIMEOUT_RR RETRIES IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2+
linux 64_no_bb_g1_mt g1 . 64_no_bb x86_64 . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
3+
linux 64_no_bb_g2_mt g2 . 64_no_bb x86_64 . . . 3 . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
4+
5+
linux 64_no_bb_g1_st g1 . 64_no_bb x86_64 . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
6+
linux 64_no_bb_g2_st g2 . 64_no_bb x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
7+
8+
linux 64_no_bb_g1_rrst g1 . 64_no_bb x86_64 . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
9+
linux 64_no_bb_g2_rrst g2 . 64_no_bb x86_64 . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
10+
linux 64_no_bb_g3_st g3 . 64_no_bb x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a

.buildkite/utilities/platforms/platforms.sh

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,31 @@ cat "${ARCHES:?}" | tr -s ' ' | while read _line; do
2929

3030
export PLATFORM=`echo $line | cut -d ' ' -f 1 | tr -s ' '`
3131
export LABEL=`echo $line | cut -d ' ' -f 2 | tr -s ' '`
32-
export ALLOW_FAIL=`echo $line | cut -d ' ' -f 3 | tr -s ' '`
33-
export ARCH=`echo $line | cut -d ' ' -f 4 | tr -s ' '`
34-
export ARCH_ROOTFS=`echo $line | cut -d ' ' -f 5 | tr -s ' '`
35-
export GROUP=`echo $line | cut -d ' ' -f 6 | tr -s ' '`
32+
export GROUP=`echo $line | cut -d ' ' -f 3 | tr -s ' '`
33+
34+
export ALLOW_FAIL=`echo $line | cut -d ' ' -f 4 | tr -s ' '`
35+
export ARCH=`echo $line | cut -d ' ' -f 5 | tr -s ' '`
36+
export ARCH_ROOTFS=`echo $line | cut -d ' ' -f 6 | tr -s ' '`
37+
3638
export MAKE_FLAGS=`echo $line | cut -d ' ' -f 7 | tr -s ' '`
3739
export TIMEOUT_BK=`echo $line | cut -d ' ' -f 8 | tr -s ' '`
3840
export TIMEOUT_RR=`echo $line | cut -d ' ' -f 9 | tr -s ' '`
39-
export RETRIES=`echo $line | cut -d ' ' -f 10 | tr -s ' '`
41+
export RETRIES=`echo $line | cut -d ' ' -f 10 | tr -s ' '`
4042
export IS_RR=`echo $line | cut -d ' ' -f 11 | tr -s ' '`
4143
export IS_ST=`echo $line | cut -d ' ' -f 12 | tr -s ' '`
4244
export IS_MT=`echo $line | cut -d ' ' -f 13 | tr -s ' '`
4345
export ROOTFS_TAG=`echo $line | cut -d ' ' -f 14 | tr -s ' '`
4446
export ROOTFS_HASH=`echo $line | cut -d ' ' -f 15 | tr -s ' '`
4547

46-
if [[ "${ALLOW_FAIL:?}" == "." ]]; then
47-
export ALLOW_FAIL="false"
48+
if [[ "${IS_ST:?}" == "yes" ]]; then
49+
if [[ "${IS_MT:?}" == "yes" ]]; then
50+
echo "You cannot set both IS_ST and IS_MT to yes"
51+
exit 1
52+
fi
4853
fi
4954

50-
if [[ "${GROUP:?}" == "." ]]; then
51-
export GROUP="all"
55+
if [[ "${ALLOW_FAIL:?}" == "." ]]; then
56+
export ALLOW_FAIL="false"
5257
fi
5358

5459
if [[ "${MAKE_FLAGS:?}" == "." ]]; then
@@ -67,12 +72,5 @@ cat "${ARCHES:?}" | tr -s ' ' | while read _line; do
6772
export RETRIES="0"
6873
fi
6974

70-
if [[ "${IS_ST:?}" == "yes" ]]; then
71-
if [[ "${IS_MT:?}" == "yes" ]]; then
72-
echo "You cannot set both IS_ST and IS_MT to yes"
73-
exit 1
74-
fi
75-
fi
76-
7775
buildkite-agent pipeline upload "${YAML:?}"
7876
done

0 commit comments

Comments
 (0)