From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 22 Jun 2018 13:34:22 +0000 (-0400)
Subject: Fix missing parameters in tox-verify job
X-Git-Tag: v0.21.2~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F11513%2F1;p=releng%2Fglobal-jjb.git

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 <thanh.ha@linuxfoundation.org>
---

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}'