ci: Remove unused MAYBE_CPUSET
The option is currently unused. If it is used again in the future, it could trivially be added back. Also, the logic is just a single undocumented python command one-liner. So remove it for now.
This commit is contained in:
1 file changed
-8
@@ -10,13 +10,6 @@ export CI_IMAGE_LABEL="bitcoin-ci-test"
|
|||||||
set -o errexit -o pipefail -o xtrace
|
set -o errexit -o pipefail -o xtrace
|
||||||
|
|
||||||
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
||||||
# Env vars during the build can not be changed. For example, a modified
|
|
||||||
# $MAKEJOBS is ignored in the build process. Use --cpuset-cpus as an
|
|
||||||
# approximation to respect $MAKEJOBS somewhat, if cpuset is available.
|
|
||||||
MAYBE_CPUSET=""
|
|
||||||
if [ "$HAVE_CGROUP_CPUSET" ]; then
|
|
||||||
MAYBE_CPUSET="--cpuset-cpus=$( python3 -c "import random;P=$( nproc );M=min(P,int('$MAKEJOBS'.lstrip('-j')));print(','.join(map(str,sorted(random.sample(range(P),M)))))" )"
|
|
||||||
fi
|
|
||||||
echo "Creating $CI_IMAGE_NAME_TAG container to run in"
|
echo "Creating $CI_IMAGE_NAME_TAG container to run in"
|
||||||
|
|
||||||
# Use buildx unconditionally
|
# Use buildx unconditionally
|
||||||
@@ -27,7 +20,6 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
|||||||
--build-arg "CI_IMAGE_NAME_TAG=${CI_IMAGE_NAME_TAG}" \
|
--build-arg "CI_IMAGE_NAME_TAG=${CI_IMAGE_NAME_TAG}" \
|
||||||
--build-arg "FILE_ENV=${FILE_ENV}" \
|
--build-arg "FILE_ENV=${FILE_ENV}" \
|
||||||
--build-arg "BASE_ROOT_DIR=${BASE_ROOT_DIR}" \
|
--build-arg "BASE_ROOT_DIR=${BASE_ROOT_DIR}" \
|
||||||
$MAYBE_CPUSET \
|
|
||||||
--platform="${CI_IMAGE_PLATFORM}" \
|
--platform="${CI_IMAGE_PLATFORM}" \
|
||||||
--label="${CI_IMAGE_LABEL}" \
|
--label="${CI_IMAGE_LABEL}" \
|
||||||
--tag="${CONTAINER_NAME}" \
|
--tag="${CONTAINER_NAME}" \
|
||||||
|
|||||||
Reference in new issue
Block a user