From 50385bf61cda37f7c0316da924c2e0b407157e4b Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 22 Jun 2018 09:34:22 -0400 Subject: [PATCH] Fix missing parameters in tox-verify job Patch If2edba598b47484b1708f1e0f3fb96f035511841 broke parameters in the tox-verify job by overriding all the existing parameters with only the PARALLEL parameter. This patch fixes it by moving the parallel parameter definition so that it is declared along with the other parameters the job requires. Issue: RELENG-1042 Change-Id: I6fdd8876235843101bc175ff91ed872aab88279d Signed-off-by: Thanh Ha --- jjb/lf-python-jobs.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index a647d9e4..e55f11c0 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -436,6 +436,10 @@ - lf-infra-tox-parameters: tox-dir: '{tox-dir}' tox-envs: '{tox-envs}' + - bool: + name: PARALLEL + default: '{parallel}' + description: Tox test type used to configure serial or parallel testing. wrappers: - lf-infra-wrappers: @@ -487,13 +491,6 @@ submodule-recursive: '{submodule-recursive}' choosing-strategy: gerrit - parameters: - - bool: - name: PARALLEL - default: '{parallel}' - description: Tox test type used to configure serial or parallel testing. - - triggers: - gerrit: server-name: '{gerrit-server-name}' -- 2.16.6