Merge "Remove maven_metadata_validate function"

diff --combined docs/jjb/lf-python-jobs.rst
index 6288c4d,14f4274..d527948
--- 1/docs/jjb/lf-python-jobs.rst
--- 2/docs/jjb/lf-python-jobs.rst
+++ b/docs/jjb/lf-python-jobs.rst
@@@ -75,11 -75,6 +75,11 @@@ IQ Server
      :submodule-recursive: Whether to checkout submodules recursively.
          (default: true)
      :gerrit_clm_triggers: Override Gerrit Triggers.
 +    :gerrit_trigger_file_paths: Override file paths which used to filter which
 +        file modifications will trigger a build. Refer to JJB documentation for
 +        "file-path" details.
 +        https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gerrit
 +
  
  Python Sonar with Tox
  ---------------------
@@@ -136,17 -131,12 +136,17 @@@ https://docs.sonarqube.org/display/PLUG
      :java-version: Version of Java to use for the build. (default: openjdk8)
      :mvn-global-settings: The name of the Maven global settings to use for
          Maven configuration. (default: global-settings)
-     :mvn-version: Version of maven to use. (default: mvn33)
+     :mvn-version: Version of maven to use. (default: mvn35)
      :stream: Keyword used to represent a release code-name.
          Often the same as the branch. (default: master)
      :submodule-recursive: Whether to checkout submodules recursively.
          (default: true)
      :gerrit_sonar_triggers: Override Gerrit Triggers.
 +    :gerrit_trigger_file_paths: Override file paths which used to filter which
 +        file modifications will trigger a build. Refer to JJB documentation for
 +        "file-path" details.
 +        https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gerrit
 +
  
  Tox Verify
  ----------
@@@ -190,7 -180,3 +190,7 @@@ following pyenv variables before runnin
          (default: '')
      :tox-envs: Tox environments to run. If blank run everything described
          in tox.ini. (default: '')
 +    :gerrit_trigger_file_paths: Override file paths which used to filter which
 +        file modifications will trigger a build. Refer to JJB documentation for
 +        "file-path" details.
 +        https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gerrit

diff --combined jjb/lf-python-jobs.yaml
index 0029f3e,3a49495..54bab29
--- 1/jjb/lf-python-jobs.yaml
--- 2/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@@ -102,9 -102,6 +102,9 @@@
      gerrit_clm_triggers:
        - comment-added-contains-event:
            comment-contains-value: run-clm$
 +    gerrit_trigger_file_paths:
 +      - compare-type: ANT
 +        pattern: '**'
  
      #####################
      # Job Configuration #
@@@ -128,7 -125,6 +128,7 @@@
                branches:
                  - branch-compare-type: ANT
                    branch-pattern: '**/{branch}'
 +              file-paths: '{obj:gerrit_trigger_file_paths}'
            skip-vote:
              successful: true
              failed: true
@@@ -215,7 -211,7 +215,7 @@@
      python-version: python2
      mvn-global-settings: global-settings
      mvn-settings: '{mvn-settings}'
-     mvn-version: mvn33
+     mvn-version: mvn35
      sonar-mvn-goal: 'sonar:sonar'
      stream: master
      submodule-recursive: true
@@@ -223,9 -219,6 +223,9 @@@
      gerrit_sonar_triggers:
        - comment-added-contains-event:
            comment-contains-value: run-sonar$
 +    gerrit_trigger_file_paths:
 +      - compare-type: ANT
 +        pattern: '**'
  
      #####################
      # Job Configuration #
@@@ -267,7 -260,6 +267,7 @@@
                branches:
                  - branch-compare-type: 'ANT'
                    branch-pattern: '**/master'
 +              file-paths: '{obj:gerrit_trigger_file_paths}'
            skip-vote:
              successful: true
              failed: true
@@@ -438,9 -430,6 +438,9 @@@
        - draft-published-event
        - comment-added-contains-event:
            comment-contains-value: recheck$
 +    gerrit_trigger_file_paths:
 +      - compare-type: ANT
 +        pattern: '**'
  
      parallel: true
  
@@@ -474,7 -463,6 +474,7 @@@
                branches:
                  - branch-compare-type: ANT
                    branch-pattern: '**/{branch}'
 +              file-paths: '{obj:gerrit_trigger_file_paths}'
  
  - job-template:
      # Python projects typically use tox to run testing.