Set OpenBLAS threads to 2 everywhere

.buildkite/hooks/post-checkout

@@ -3,9 +3,9 @@
 set -euo pipefail
 
 # Buildkite users can trigger new builds with these values overridden to
-# test specific julia gitshas 
-UPSTREAM_URL="${UPSTREAM_URL:-https://github.com/gbaraldi/julia.git}"
-UPSTREAM_BRANCH="${UPSTREAM_BRANCH:-windows-experiment}"
+# test specific julia gitshas
+UPSTREAM_URL="${UPSTREAM_URL:-https://github.com/JuliaLang/julia.git}"
+UPSTREAM_BRANCH="${UPSTREAM_BRANCH:-master}"
 
 # All of our workers are required to provide a default for the julia cache dir
 # We're going to cache repositories in here, just like buildkite itself would:

utilities/test_julia.sh

@@ -40,7 +40,7 @@ ${JULIA_BINARY} -e 'using InteractiveUtils; InteractiveUtils.versioninfo()'
 
 echo "--- Set some environment variables"
 # Prevent OpenBLAS from spinning up a large number of threads on our big machines
-export OPENBLAS_NUM_THREADS="${JULIA_CPU_THREADS}"
+export OPENBLAS_NUM_THREADS=2
 export JULIA_TEST_IS_BASE_CI="true"
 unset JULIA_DEPOT_PATH
 unset JULIA_PKG_SERVER
@@ -77,10 +77,6 @@ elif [[ "${USE_RR-}" == "" ]]; then
     export NCORES_FOR_TESTS="${JULIA_CPU_THREADS}"
     export JULIA_NUM_THREADS="${JULIA_CPU_THREADS}"
     export JULIA_NUM_THREADS=1 # TODO: delete this line once we support running CI with threads
-
-    if [[ "${OS}" == "windows" ]]; then
-        export OPENBLAS_NUM_THREADS=1
-    fi
 
     # We don't run `Pkg` on any 32-bit platforms, since it uses too much memory
     if [[ "${ARCH}" == i686 ]] || [[ "${ARCH}" == "armv7l" ]]; then