From 0201cff09e2b36e040ae6a4408e5fe0b58eeda85 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 4 Nov 2021 15:28:51 -0400 Subject: [PATCH] CI (Buildkite): add Pkg, Artifacts, and LazyArtifacts to the list of "network-related stdlibs" that we test in a separate Buildkite job (#42885) (cherry picked from commit 8e87263129f4edbcda169c30afe1f528c11d0ca5) --- .../main/platforms/package_linux.arches | 14 ++++---- .../main/platforms/tester_linux.arches | 33 ++++++++++++------- .../pipelines/main/platforms/tester_linux.yml | 29 ++++++++++++---- .../scheduled/no_bb/no_bb_tester_linux.arches | 13 ++++++-- .buildkite/utilities/platforms/platforms.sh | 30 ++++++++--------- 5 files changed, 75 insertions(+), 44 deletions(-) diff --git a/.buildkite/pipelines/main/platforms/package_linux.arches b/.buildkite/pipelines/main/platforms/package_linux.arches index ebf57471d59fd..dec82f530a832 100644 --- a/.buildkite/pipelines/main/platforms/package_linux.arches +++ b/.buildkite/pipelines/main/platforms/package_linux.arches @@ -1,7 +1,7 @@ -# 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 -linux 32 . 32 i686 . . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 -linux 64 . 64 x86_64 . . . . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -# linux _aarch64 . _aarch64 aarch64 . . . . . . . . .... ........................................ -# linux _armv7l . _armv7l armv7l . . . . . . . . .... ........................................ -# linux _ppc64le . _ppc64le powerpc64le . . . . . . . . .... ........................................ -musl 64 . 64 x86_64 . . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 +# 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 +linux 32 . . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 +linux 64 . . 64 x86_64 . . . . . . . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +# linux aarch64 . . aarch64 aarch64 . . . . . . . .... ........................................ +# linux armv7l . . armv7l armv7l . . . . . . . .... ........................................ +# linux ppc64le . . ppc64le powerpc64le . . . . . . . .... ........................................ +musl 64 . . 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 diff --git a/.buildkite/pipelines/main/platforms/tester_linux.arches b/.buildkite/pipelines/main/platforms/tester_linux.arches index 9c55266e56307..7e0ef1ee2a35d 100644 --- a/.buildkite/pipelines/main/platforms/tester_linux.arches +++ b/.buildkite/pipelines/main/platforms/tester_linux.arches @@ -1,14 +1,25 @@ -# 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 +# 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 +linux 32_g1 g1 . 32 i686 . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 +linux 32_g2 g2 . 32 i686 . . . 3 . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 -linux 32 . 32 i686 no-net . . . . . . . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 -linux 32_net . 32 i686 net . . . 3 . yes . v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957 +linux 64_g1_mt g1 . 64 x86_64 . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_g2_mt g2 . 64 x86_64 . . . 3 . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -linux 64_rr . 64 x86_64 no-net . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -linux 64_net . 64 x86_64 net . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -linux 64_st . 64 x86_64 no-net . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -linux 64_mt . 64 x86_64 no-net . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_g1_st g1 . 64 x86_64 . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_g2_st g2 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -# linux _aarch64 . _aarch64 aarch64 . . . . . . . . .... ........................................ -# linux _armv7l . _armv7l armv7l . . . . . . . . .... ........................................ -# linux _ppc64le . _ppc64le powerpc64le . . . . . . . . .... ........................................ -musl 64 true 64 x86_64 . . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 +linux 64_g1_rrst g1 . 64 x86_64 . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_g2_rrst g2 . 64 x86_64 . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_g3_st g3 . 64 x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a + +# linux aarch64_g1 g1 true aarch64 aarch64 . . . . . . . ---- ---------------------------------------- +# linux aarch64_g2 g2 true aarch64 aarch64 . . . . . . . ---- ---------------------------------------- + +# linux armv7l_g1 g1 true armv7l armv7l . . . . . . . ---- ---------------------------------------- +# linux armv7l_g2 g2 true armv7l armv7l . . . . . . . ---- ---------------------------------------- + +# linux ppc64le_g1 g1 true ppc64le powerpc64le . . . . . . . ---- ---------------------------------------- +# linux ppc64le_g2 g2 true ppc64le powerpc64le . . . . . . . ---- ---------------------------------------- + +musl 64_g1 g1 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 +musl 64_g2 g2 true 64 x86_64 . . . . . . . v4.8 d13a47c87c38005bd5d97132e51789cafd852f90 diff --git a/.buildkite/pipelines/main/platforms/tester_linux.yml b/.buildkite/pipelines/main/platforms/tester_linux.yml index 5b9b5ff475da1..7572e3d880e3f 100644 --- a/.buildkite/pipelines/main/platforms/tester_linux.yml +++ b/.buildkite/pipelines/main/platforms/tester_linux.yml @@ -56,16 +56,30 @@ steps: echo "JULIA_CPU_THREADS is: $${JULIA_CPU_THREADS:?}" $${JULIA_BINARY:?} -e '@info "" Sys.CPU_THREADS' - echo "--- Set some environment variables in preparation for running the Julia test suite" - unset JULIA_DEPOT_PATH + echo "--- Set some environment variables" export OPENBLAS_NUM_THREADS=8 + unset JULIA_DEPOT_PATH + unset JULIA_PKG_SERVER + + export NETWORK_RELATED_TESTS="Artifacts Downloads download LazyArtifacts LibGit2/online Pkg" if [[ "${GROUP?}" == "all" ]]; then - export TESTS="all" - elif [[ "${GROUP?}" == "net" ]]; then - export TESTS="Downloads LibGit2 LibGit2/online download" - elif [[ "${GROUP?}" == "no-net" ]]; then - export TESTS="all --skip Downloads LibGit2/online download" + export TESTS="all LibGit2/online --force-net" + elif [[ "${GROUP?}" == "all_except_pkg" ]]; then + export TESTS="all LibGit2/online --force-net --skip Pkg" + elif [[ "${GROUP?}" == "g1" ]]; then + # Group 1: ALL tests EXCEPT the network-related tests. + export TESTS="all --force-net --skip $${NETWORK_RELATED_TESTS:?}" + elif [[ "${GROUP?}" == "g2" ]]; then + # Group 2: ONLY the network-related tests. + # In Group 2, we use whatever the default setting is with regards to the Pkg server. + export TESTS="$${NETWORK_RELATED_TESTS:?} --force-net" + elif [[ "${GROUP?}" == "g3" ]]; then + # Group 3: only Pkg. + # In Group 3, we explicitly opt-out of the Pkg server. + # The purpose of group 3 is to test the non-Pkg-server codepaths of Pkg. + export TESTS="Pkg --force-net" + export JULIA_PKG_SERVER="" else echo "Invalid value for GROUP: ${GROUP?}" exit 1 @@ -89,6 +103,7 @@ steps: export JULIA_NUM_THREADS=16 fi + echo "--- Print the test group, list of test sets, and other useful environment variables" echo "JULIA_CMD_FOR_TESTS is: $${JULIA_CMD_FOR_TESTS:?}" echo "JULIA_NUM_THREADS is: $${JULIA_NUM_THREADS}" # Note: this environment variable might not be set echo "NCORES_FOR_TESTS is: $${NCORES_FOR_TESTS:?}" diff --git a/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches b/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches index 4309db01e1050..d9098511d59ed 100644 --- a/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches +++ b/.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches @@ -1,3 +1,10 @@ -# 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 -linux 64_no_bb . 64_no_bb x86_64 no-net . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a -linux 64_no_bb_net . 64_no_bb x86_64 net . 180 120 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +# 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 +linux 64_no_bb_g1_mt g1 . 64_no_bb x86_64 . . . . . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_no_bb_g2_mt g2 . 64_no_bb x86_64 . . . 3 . . yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a + +linux 64_no_bb_g1_st g1 . 64_no_bb x86_64 . . . . . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_no_bb_g2_st g2 . 64_no_bb x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a + +linux 64_no_bb_g1_rrst g1 . 64_no_bb x86_64 . 180 120 . yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_no_bb_g2_rrst g2 . 64_no_bb x86_64 . 120 60 3 yes yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a +linux 64_no_bb_g3_st g3 . 64_no_bb x86_64 . . . 3 . yes . v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a diff --git a/.buildkite/utilities/platforms/platforms.sh b/.buildkite/utilities/platforms/platforms.sh index 75674d4428394..bbfccb7a4a3a1 100755 --- a/.buildkite/utilities/platforms/platforms.sh +++ b/.buildkite/utilities/platforms/platforms.sh @@ -29,26 +29,31 @@ cat "${ARCHES:?}" | tr -s ' ' | while read _line; do export PLATFORM=`echo $line | cut -d ' ' -f 1 | tr -s ' '` export LABEL=`echo $line | cut -d ' ' -f 2 | tr -s ' '` - export ALLOW_FAIL=`echo $line | cut -d ' ' -f 3 | tr -s ' '` - export ARCH=`echo $line | cut -d ' ' -f 4 | tr -s ' '` - export ARCH_ROOTFS=`echo $line | cut -d ' ' -f 5 | tr -s ' '` - export GROUP=`echo $line | cut -d ' ' -f 6 | tr -s ' '` + export GROUP=`echo $line | cut -d ' ' -f 3 | tr -s ' '` + + export ALLOW_FAIL=`echo $line | cut -d ' ' -f 4 | tr -s ' '` + export ARCH=`echo $line | cut -d ' ' -f 5 | tr -s ' '` + export ARCH_ROOTFS=`echo $line | cut -d ' ' -f 6 | tr -s ' '` + export MAKE_FLAGS=`echo $line | cut -d ' ' -f 7 | tr -s ' '` export TIMEOUT_BK=`echo $line | cut -d ' ' -f 8 | tr -s ' '` export TIMEOUT_RR=`echo $line | cut -d ' ' -f 9 | tr -s ' '` - export RETRIES=`echo $line | cut -d ' ' -f 10 | tr -s ' '` + export RETRIES=`echo $line | cut -d ' ' -f 10 | tr -s ' '` export IS_RR=`echo $line | cut -d ' ' -f 11 | tr -s ' '` export IS_ST=`echo $line | cut -d ' ' -f 12 | tr -s ' '` export IS_MT=`echo $line | cut -d ' ' -f 13 | tr -s ' '` export ROOTFS_TAG=`echo $line | cut -d ' ' -f 14 | tr -s ' '` export ROOTFS_HASH=`echo $line | cut -d ' ' -f 15 | tr -s ' '` - if [[ "${ALLOW_FAIL:?}" == "." ]]; then - export ALLOW_FAIL="false" + if [[ "${IS_ST:?}" == "yes" ]]; then + if [[ "${IS_MT:?}" == "yes" ]]; then + echo "You cannot set both IS_ST and IS_MT to yes" + exit 1 + fi fi - if [[ "${GROUP:?}" == "." ]]; then - export GROUP="all" + if [[ "${ALLOW_FAIL:?}" == "." ]]; then + export ALLOW_FAIL="false" fi if [[ "${MAKE_FLAGS:?}" == "." ]]; then @@ -67,12 +72,5 @@ cat "${ARCHES:?}" | tr -s ' ' | while read _line; do export RETRIES="0" fi - if [[ "${IS_ST:?}" == "yes" ]]; then - if [[ "${IS_MT:?}" == "yes" ]]; then - echo "You cannot set both IS_ST and IS_MT to yes" - exit 1 - fi - fi - buildkite-agent pipeline upload "${YAML:?}" done