From 49359452aea0306a4f97e1ad7837a2b3977e3a34 Mon Sep 17 00:00:00 2001 From: Guillaume DeMengin Date: Mon, 28 Nov 2022 21:22:51 +0100 Subject: [PATCH] fix CI issues - use multiprocess to avoid pickle errors in tox on macos - change nodeset of jjb-tox-cross-jenkins-job-builder Closes-Bug: #1998146 Change-Id: Id3ccee0f2f6ffb86c67b222f4cb0a869ba8c6bda --- .zuul.yaml | 1 + test-requirements.txt | 1 + tests/helper.py | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d5c240d..693132d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,6 +3,7 @@ name: jjb-tox-cross-jenkins-job-builder description: Tests compatibility with master branch of jenkins-job-builder parent: tox-py27 + nodeset: ubuntu-xenial required-projects: - jjb/python-jenkins - jjb/jenkins-job-builder diff --git a/test-requirements.txt b/test-requirements.txt index 483c7aa..c126676 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,3 +13,4 @@ stestr>=2.0.0,!=3.0.0 testscenarios testtools pre-commit +multiprocess diff --git a/tests/helper.py b/tests/helper.py index 5511c54..6c5a84e 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,7 +1,7 @@ import functools import json -from multiprocessing import Process -from multiprocessing import Queue +from multiprocess import Process +from multiprocess import Queue import traceback from mock import Mock