From: Andrew Grimberg Date: Tue, 15 Aug 2017 15:17:07 +0000 (+0000) Subject: Merge "Migrate Maven Verify job template" X-Git-Tag: v0.7.0~6 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=d5701687893b11024f892c00a5e81ca6d94d0866;hp=-c;p=releng%2Fglobal-jjb.git Merge "Migrate Maven Verify job template" --- d5701687893b11024f892c00a5e81ca6d94d0866 diff --combined jjb/lf-macros.yaml index af9528ce,4759b44a..bc9901d3 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@@ -266,20 -266,13 +266,20 @@@ job is triggered by Gerrit. - string: name: GERRIT_REFSPEC - default: '' + default: 'refs/heads/{branch}' description: | Parameter to identify a refspec when pulling from Gerrit. Note that Gerrit will override this parameter automatically if a job is triggered by Gerrit. - + - string: + name: LFTOOLS_VERSION + default: '{lftools-version}' + description: | + Version of lftools to install. Can be a specific version like + '0.6.0' or a PEP-440 definition. + https://www.python.org/dev/peps/pep-0440/ + For example '<1.0.0' or '>=1.0.0,<2.0.0'. - parameter: name: lf-infra-tox-parameters @@@ -316,6 -309,23 +316,23 @@@ # PUBLISHERS # ############## + - publisher: + name: lf-jacoco-report + publishers: + - jacoco: + exec-pattern: "**/**.exec" + class-pattern: "**/classes" + source-pattern: "**/src/main/java" + exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**" + status-update: true + targets: + - branch: + healthy: 10 + unhealthy: 20 + - method: + healthy: 50 + unhealthy: 40 + - publisher: name: lf-infra-publish # lf-infra macro to finish up a build. diff --combined jjb/lf-maven-jobs.yaml index f1fc74a9,0238e9d6..1dd899e6 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@@ -10,6 -10,7 +10,7 @@@ jobs: - gerrit-maven-clm - gerrit-maven-release + - gerrit-maven-verify - job-group: name: '{project-name}-github-maven-jobs' @@@ -20,6 -21,7 +21,7 @@@ jobs: - github-maven-clm - github-maven-release + - github-maven-verify #################### # COMMON FUNCTIONS # @@@ -41,7 -43,6 +43,7 @@@ project: '{project}' branch: '{branch}' stream: '{stream}' + lftools-version: '{lftools-version}' - lf-infra-maven-parameters: mvn-opts: '{mvn-opts}' mvn-params: '{mvn-params}' @@@ -254,3 -255,154 +256,154 @@@ submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' + + ################ + # Maven Verify # + ################ + + - lf_maven_verify: &lf_maven_verify + name: lf-maven-verify + + # Verify job which runs mvn clean install to test a project build.. + # + # 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 + stream: master + submodule-recursive: true + + gerrit_verify_triggers: + - patchset-created-event: + exclude-drafts: false + exclude-trivial-rebase: false + exclude-no-code-change: false + - draft-published-event + - comment-added-contains-event: + comment-contains-value: recheck$ + 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}' + - shell: !include-raw-escape: + - ../shell/lftools-install.sh + - ../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-{stream}-{mvn-version}-{java-version}' + id: gerrit-maven-verify + <<: *lf_maven_common + # yamllint disable-line rule:key-duplicates + <<: *lf_maven_verify + + 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}' + + - job-template: + name: '{project-name}-maven-verify-{stream}-{mvn-version}-{java-version}' + id: github-maven-verify + <<: *lf_maven_common + # yamllint disable-line rule:key-duplicates + <<: *lf_maven_verify + + properties: + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '+refs/pull/*:refs/remotes/origin/pr/*' + branch: '{branch}' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - lf-infra-github-pr-trigger: + trigger-phrase: '^recheck$' + only-trigger-phrase: false + status-context: 'Maven Verify' + permit-all: true + github-hooks: true + github-org: '' + github_pr_whitelist: + - '' + github_pr_admin_list: + - ''