Merge "Make gerrit-branch-lock work for all proj/branches"

diff --combined jjb/lf-ci-jobs.yaml
index 1d99d69,3106d8b..701898c
--- 1/jjb/lf-ci-jobs.yaml
--- 2/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@@ -166,19 -166,18 +166,18 @@@
  ######################
  
  - job-template:
-     name: "{project-name}-gerrit-branch-lock-{stream}"
+     name: "{project-name}-gerrit-branch-lock"
      id: gerrit-branch-lock
  
      ######################
      # Default parameters #
      ######################
  
-     branch: master
+     branch: "**"
      disable-job: false
      git-url: "$GIT_URL/$GERRIT_PROJECT"
-     stream: master
      submodule-timeout: 10
-     submodule-disable: false
+     submodule-disable: true
      gerrit_merge_triggers:
        - comment-added-contains-event:
            comment-contains-value: (un)?lock branch$
@@@ -199,7 -198,7 +198,7 @@@
      parameters:
        - lf-infra-parameters:
            project: "{project}"
-           stream: "{stream}"
+           stream: ""
            branch: "{branch}"
  
      wrappers:
@@@ -211,7 -210,7 +210,7 @@@
        - lf-infra-gerrit-scm:
            git-url: "{git-url}"
            refspec: ""
-           branch: "{branch}"
+           branch: "$GERRIT_BRANCH"
            submodule-recursive: false
            submodule-timeout: "{submodule-timeout}"
            submodule-disable: "{submodule-disable}"
@@@ -224,7 -223,7 +223,7 @@@
            trigger-on: "{obj:gerrit_merge_triggers}"
            projects:
              - project-compare-type: ANT
-               project-pattern: "{project}"
+               project-pattern: "**"
                branches:
                  - branch-compare-type: ANT
                    branch-pattern: "**/{branch}"
@@@ -565,7 -564,9 +564,7 @@@
      builders:
        - lf-infra-jjbini
        - shell: !include-raw-escape:
 -          - ../shell/jjb-install.sh
            - ../shell/jenkins-sandbox-cleanup.sh
 -          - ../shell/jjb-cleanup.sh
  
  - job-template:
      name: "{project-name}-jenkins-sandbox-cleanup"