diff --git a/.zuul.yaml b/.zuul.yaml index e7379f63df..b9ad789b60 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -199,12 +199,22 @@ - playbooks/zuul-migrate/.* nodeset: ubuntu-xenial timeout: 3600 # 60 minutes + vars: + test_setup_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test + tox_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test - tox-py37: irrelevant-files: - zuul/cmd/migrate.py - playbooks/zuul-migrate/.* timeout: 3600 # 60 minutes nodeset: ubuntu-bionic + vars: + test_setup_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test + tox_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test - zuul-build-dashboard - zuul-build-dashboard-multi-tenant - nodejs-npm-run-lint: @@ -245,12 +255,22 @@ - playbooks/zuul-migrate/.* nodeset: ubuntu-xenial timeout: 3600 # 60 minutes + vars: + test_setup_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test + tox_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test - tox-py37: irrelevant-files: - zuul/cmd/migrate.py - playbooks/zuul-migrate/.* timeout: 3600 # 60 minutes nodeset: ubuntu-bionic + vars: + test_setup_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test + tox_environment: + ZUUL_TEST_ROOT: /tmp/zuul-test - zuul-build-dashboard - nodejs-npm-run-lint: vars: diff --git a/tools/test-setup.sh b/tools/test-setup.sh index e9ca7dca30..f4576ffb6a 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -12,6 +12,12 @@ sudo service zookeeper stop DATADIR=$(sed -n -e 's/^dataDir=//p' /etc/zookeeper/conf/zoo.cfg) sudo mount -t tmpfs -o nodev,nosuid,size=500M none $DATADIR +# Prepare a tmpfs for Zuul test root +if [[ -n "${ZUUL_TEST_ROOT:-}" ]]; then + sudo mkdir -p "$ZUUL_TEST_ROOT" + sudo mount -t tmpfs -o noatime,nodev,nosuid,size=64M none "$ZUUL_TEST_ROOT" +fi + # Be sure mysql and zookeeper are started. sudo service mysql start sudo service postgresql start