Merge "Add Maven job to build dependencies with patches"

diff --combined jjb/lf-macros.yaml
index 22ca758,d56b25f..54a547d
--- 1/jjb/lf-macros.yaml
--- 2/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@@ -3,6 -3,20 +3,20 @@@
  # BUILDERS #
  ############
  
+ - builder:
+     name: lf-fetch-dependent-patches
+     # Fetches all patches provided via comment trigger
+     #
+     # This macro will fetch all patches provided via comment trigger and will
+     # create a list of projects from those patches via environment variable
+     # called DEPENDENCY_BUILD_ORDER which can be used if necessary to build
+     # projects in the specified order. The order is determined by first patch
+     # instance for a project in the patch list.
+     builders:
+       - shell: !include-raw: ../shell/gerrit-fetch-dependencies.sh
+       - inject:
+           properties-file: $WORKSPACE/.dependency.properties
+ 
  - builder:
      name: lf-infra-create-netrc
      # Macro to create a ~/.netrc file from a Maven settings.xml
@@@ -306,19 -320,6 +320,19 @@@
                https://www.python.org/dev/peps/pep-0440/
                For example '<1.0.0' or '>=1.0.0,<2.0.0'.
  
 +- parameter:
 +    name: lf-infra-node-parameters
 +    # Parameters for NodeJS
 +    parameters:
 +      - string:
 +          name: NODE_DIR
 +          default: '{node-dir}'
 +          description: Path to a Node project directory.
 +      - string:
 +          name: NODE_VERSION
 +          default: '{node-version}'
 +          description: Version of NodeJS to install.
 +
  - parameter:
      name: lf-infra-tox-parameters
      # Useful parameters when working with TOX

diff --combined jjb/lf-maven-jobs.yaml
index 93749cd,c6bfe1f..44b3470
--- 1/jjb/lf-maven-jobs.yaml
--- 2/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@@ -11,6 -11,7 +11,7 @@@
        - gerrit-maven-clm
        - gerrit-maven-release
        - gerrit-maven-verify
+       - gerrit-maven-verify-dependencies
  
  - job-group:
      name: '{project-name}-github-maven-jobs'
@@@ -100,23 -101,8 +101,23 @@@
      #                   the project.
      #
      # Optional parameters:
 -    #     mvn-global-settings: The name of the Maven global settings to use for
 -    #                          Maven configuration. (default: global-settings)
 +    #
 +    #     :branch: The branch to build against. (default: master)
 +    #     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
 +    #     :build-timeout: Timeout in seconds before aborting build. (default: 60)
 +    #     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
 +    #     :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-opts: Sets MAVEN_OPTS. (default: '')
 +    #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
 +    #     :mvn-version: Version of maven to use. (default: mvn33)
 +    #     :stream: Keyword that can be 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_merge_triggers: Override Gerrit Triggers.
  
      ######################
      # Default parameters #
@@@ -131,10 -117,12 +132,10 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn33
 +    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
 -    # Staging repos do not make sense for CLM jobs so set it blank.
 -    staging-profile-id: ''
 -
      #####################
      # Job Configuration #
      #####################
@@@ -227,12 -215,10 +228,12 @@@
      #     :mvn-opts: Sets MAVEN_OPTS. (default: '')
      #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
      #     :mvn-version: Version of maven to use. (default: mvn33)
 +    #     :stream: Keyword that can be 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_javadoc_merge_triggers: Override Gerrit Triggers.
 +    #     :gerrit_merge_triggers: Override Gerrit Triggers.
  
      ######################
      # Default parameters #
@@@ -251,7 -237,7 +252,7 @@@
      stream: master
      submodule-recursive: true
  
 -    gerrit_javadoc_merge_triggers:
 +    gerrit_merge_triggers:
        - change-merged-event
        - comment-added-contains-event:
            comment-contains-value: remerge$
@@@ -298,7 -284,7 +299,7 @@@
      triggers:
        - gerrit:
            server-name: '{gerrit-server-name}'
 -          trigger-on: '{obj:gerrit_javadoc_merge_triggers}'
 +          trigger-on: '{obj:gerrit_merge_triggers}'
            projects:
              - project-compare-type: ANT
                project-pattern: '{project}'
@@@ -371,12 -357,10 +372,12 @@@
      #     :mvn-opts: Sets MAVEN_OPTS. (default: '')
      #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
      #     :mvn-version: Version of maven to use. (default: mvn33)
 +    #     :stream: Keyword that can be 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_javadoc_verify_triggers: Override Gerrit Triggers.
 +    #     :gerrit_verify_triggers: Override Gerrit Triggers.
  
      ######################
      # Default parameters #
@@@ -395,7 -379,7 +396,7 @@@
      stream: master
      submodule-recursive: true
  
 -    gerrit_javadoc_verify_triggers:
 +    gerrit_verify_triggers:
        - patchset-created-event:
            exclude-drafts: true
            exclude-trivial-rebase: false
@@@ -438,7 -422,7 +439,7 @@@
      triggers:
        - gerrit:
            server-name: '{gerrit-server-name}'
 -          trigger-on: '{obj:gerrit_javadoc_verify_triggers}'
 +          trigger-on: '{obj:gerrit_verify_triggers}'
            projects:
              - project-compare-type: ANT
                project-pattern: '{project}'
@@@ -492,7 -476,6 +493,7 @@@
      # directory can then be reused later to deploy to Nexus.
      #
      # Required parameters:
 +    #
      #     :build-node: The node to run build on.
      #     :jenkins-ssh-credential: Credential to use for SSH. (Generally should
      #                              be configured in defaults.yaml)
@@@ -503,27 -486,12 +504,27 @@@
      #     :staging-profile-id: Profile ID of the project's Nexus staging profile.
      #
      # Optional parameters:
 -    #     :gerrit_verify_triggers: Override Gerrit Triggers.
 -    #     :mvn-global-settings: The name of the Maven global settings to use for
 -    #                           Maven configuration. (default: global-settings)
 +    #
 +    #     :branch: The branch to build against. (default: master)
 +    #     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
 +    #     :build-timeout: Timeout in seconds before aborting build. (default: 60)
      #     :cron: Cron schedule when to trigger the job. This parameter also
      #         supports multiline input via YAML pipe | character in cases where
      #         one may want to provide more than 1 cron timer. (default: '')
 +    #     :deploy-path:    The path in Nexus to deploy javadoc to. (default: $PROJECT/$STREAM)
 +    #     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
 +    #     :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-opts: Sets MAVEN_OPTS. (default: '')
 +    #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
 +    #     :mvn-version: Version of maven to use. (default: mvn33)
 +    #     :stream: Keyword that can be 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_release_triggers: Override Gerrit Triggers.
  
      ######################
      # Default parameters #
@@@ -532,7 -500,6 +533,7 @@@
      branch: master
      build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
      build-timeout: 30
 +    cron: ''
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
      mvn-global-settings: global-settings
@@@ -541,6 -508,7 +542,6 @@@
      mvn-version: mvn33
      stream: master
      submodule-recursive: true
 -    cron: ''
  
      gerrit_release_triggers:
        - comment-added-contains-event:
@@@ -661,8 -629,6 +662,8 @@@
      #     :mvn-opts: Sets MAVEN_OPTS. (default: '')
      #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
      #     :mvn-version: Version of maven to use. (default: mvn33)
 +    #     :stream: Keyword that can be used to represent a release code-name.
 +    #         Often the same as the branch. (default: master)
      #     :submodule-recursive: Whether to checkout submodules recursively.
      #         (default: true)
      #
@@@ -681,7 -647,6 +682,7 @@@
      mvn-opts: ''
      mvn-params: ''
      mvn-version: mvn33
 +    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -689,6 -654,9 +690,6 @@@
        - comment-added-contains-event:
            comment-contains-value: run-sonar$
  
 -    # Staging repos do not make sense for CLM jobs so set it blank.
 -    staging-profile-id: ''
 -
      #####################
      # Job Configuration #
      #####################
@@@ -839,7 -807,6 +840,7 @@@
      mvn-opts: ''
      mvn-params: '-Dstream=$STREAM'
      mvn-version: mvn33
 +    staging-profile-id: ''  # Unused in this job
      stream: master
      submodule-recursive: true
  
@@@ -939,3 -906,126 +940,126 @@@
              - ''
            github_pr_admin_list:
              - ''
+ 
+ #############################
+ # Maven Verify Dependencies #
+ #############################
+ 
+ - lf_maven_verify_dependencies: &lf_maven_verify_dependencies
+     name: lf-maven-verify-dependencies
+ 
+     # Verify job which runs mvn clean install to test a project build /w deps
+     #
+     # This job can be used to verify a patch in conjunction to all of the
+     # upstream patches it depends on. The user of this job can provide a list
+     # via comment trigger. The trigger is:
+     #
+     #     'recheck: SPACE_SEPERATED_LIST_OF_PATCHES'
+     #
+     # Required parameters:
+     #
+     #     :build-node: The node to run build on.
+     #     :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+     #         be configured in defaults.yaml)
+     #     :mvn-settings: The name of settings file containing credentials for
+     #         the project.
+     #
+     # Optional parameters:
+     #
+     #     :branch: Git branch to fetch for the build. (default: master)
+     #     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
+     #     :build-timeout: Timeout in seconds before aborting build. (default: 60)
+     #     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
+     #     :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-opts: Sets MAVEN_OPTS. (default: '')
+     #     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
+     #     :mvn-version: Version of maven to use. (default: mvn33)
+     #     :stream: Keyword that can be 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_verify_triggers: Override Gerrit Triggers.
+     #     :gerrit_trigger_file_paths: Override file paths which can be used to
+     #         filter which file modifications will trigger a build.
+ 
+     ######################
+     # Default parameters #
+     ######################
+ 
+     branch: master
+     build-days-to-keep: 7
+     build-timeout: 60
+     git-url: '$GIT_URL/$PROJECT'
+     java-version: openjdk8
+     mvn-global-settings: global-settings
+     mvn-opts: ''
+     mvn-params: '-Dstream=$STREAM'
+     mvn-version: mvn33
+     staging-profile-id: ''  # Unused by this job
+     stream: master
+     submodule-recursive: true
+ 
+     gerrit_verify_triggers:
+       - comment-added-contains-event:
+           comment-contains-value: 'recheck: [0-9 ]+'
+     gerrit_trigger_file_paths:
+       - compare-type: ANT
+         pattern: '**'
+ 
+     #####################
+     # Job Configuration #
+     #####################
+ 
+     concurrent: true
+ 
+     builders:
+       - lf-jacoco-nojava-workaround
+       - lf-maven-install:
+           mvn-version: '{mvn-version}'
+       - lf-provide-maven-settings:
+           global-settings-file: '{mvn-global-settings}'
+           settings-file: '{mvn-settings}'
+       - lf-fetch-dependent-patches
+       - shell: !include-raw-escape:
+           - ../shell/common-variables.sh
+           - ../shell/maven-build-deps.sh
+       - shell: !include-raw-escape:
+           - ../shell/common-variables.sh
+           - ../shell/maven-build.sh
+       - lf-provide-maven-settings-cleanup
+ 
+     publishers:
+       - findbugs
+       - lf-jacoco-report
+       - lf-infra-publish
+ 
+ - job-template:
+     name: '{project-name}-maven-verify-deps-{stream}-{mvn-version}-{java-version}'
+     id: gerrit-maven-verify-dependencies
+     <<: *lf_maven_common
+     # yamllint disable-line rule:key-duplicates
+     <<: *lf_maven_verify_dependencies
+ 
+     scm:
+       - lf-infra-gerrit-scm:
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+           git-url: '{git-url}'
+           refspec: '$GERRIT_REFSPEC'
+           branch: '$GERRIT_BRANCH'
+           submodule-recursive: '{submodule-recursive}'
+           choosing-strategy: gerrit
+ 
+     triggers:
+       - gerrit:
+           server-name: '{gerrit-server-name}'
+           trigger-on: '{obj:gerrit_verify_triggers}'
+           projects:
+             - project-compare-type: ANT
+               project-pattern: '{project}'
+               branches:
+                 - branch-compare-type: ANT
+                   branch-pattern: '**/{branch}'
+               file-paths: '{obj:gerrit_trigger_file_paths}'