Merge "Remove extra parameter quotes"

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index a7fd30a..788dc46 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -412,7 +412,9 @@
     ######################
 
     branch: master
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    # jjb-deploy should always clone $PROJECT regardless of what
+    # $GERRIT_PROJECT triggered the job.
+    git-url: '$GIT_URL/$PROJECT'
     stream: master
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index a647d9e..e55f11c 100644 (file)
--- 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}'