X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=2de5d8b0058b54ef2717c121108e8131a274ca85;hb=90db9af77b1d31e7c22e6dc181c8b8c6f00b821e;hp=0029f3ec03d49f4851175493d17f1d0528601b51;hpb=c3ba703ba67d673323d328d949f45b206cbf5e9a;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 0029f3ec..2de5d8b0 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -51,7 +51,6 @@ archive-artifacts: > **/*.log - nexus-iq-cli-version: 1.44.0-01 ##################### # Job Configuration # @@ -93,47 +92,39 @@ branch: master build-days-to-keep: 30 # 30 days for troubleshooting purposes build-timeout: 60 + disable-job: false git-url: '$GIT_URL/$PROJECT' + github-url: 'https://github.com' java-version: openjdk8 - staging-profile-id: '' # Unused in this job + nexus-iq-cli-version: 1.44.0-01 stream: master submodule-recursive: true - gerrit_clm_triggers: - - comment-added-contains-event: - comment-contains-value: run-clm$ gerrit_trigger_file_paths: - compare-type: ANT - pattern: '**' + pattern: '.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*' ##################### # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + lftools-version: '{lftools-version}' - string: name: NEXUS_IQ_CLI_VERSION default: '{nexus-iq-cli-version}' description: Nexus IQ CLI package to download and use. - triggers: - # Build weekly on Saturdays - - timed: 'H H * * 6' - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_clm_triggers}' - projects: - - project-compare-type: ANT - project-pattern: '{project}' - branches: - - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true wrappers: - credentials-binding: - username-password-separated: @@ -153,6 +144,18 @@ # yamllint disable-line rule:key-duplicates <<: *lf_python_xc_clm + ###################### + # Default parameters # + ###################### + + gerrit_clm_triggers: + - comment-added-contains-event: + comment-contains-value: run-clm$ + + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -162,6 +165,25 @@ submodule-recursive: '{submodule-recursive}' choosing-strategy: default + triggers: + # Build weekly on Saturdays + - timed: 'H H * * 6' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_clm_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + - job-template: name: '{project-name}-python-clm-{stream}' id: github-python-xc-clm @@ -170,8 +192,10 @@ <<: *lf_python_xc_clm properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' - github: - url: '{git-url}/{github-org}/{project}' + url: '{github-url}/{github-org}/{project}' scm: - lf-infra-github-scm: @@ -183,17 +207,17 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + # Build weekly on Saturdays + - timed: 'H H * * 6' + - github-pull-request: trigger-phrase: '^run-clm$' only-trigger-phrase: false status-context: 'CLM' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + white-list-target-branches: + - '{branch}' + included-regions: '{obj:github_included_regions}' ######################## # Python Sonar with Tox # @@ -210,27 +234,32 @@ build-days-to-keep: 7 build-timeout: 60 cron: 'H H * * *' # run daily + disable-job: false git-url: '$GIT_URL/$PROJECT' + github-url: 'https://github.com' java-version: openjdk8 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 - gerrit_sonar_triggers: - - comment-added-contains-event: - comment-contains-value: run-sonar$ gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**' + - compare-type: REG_EXP + pattern: '.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*' ##################### # Job Configuration # ##################### + disabled: '{disable-job}' + parameters: - lf-infra-parameters: project: '{project}' @@ -256,24 +285,6 @@ however to use a specific version of the sonar-maven-plugin we can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar". - triggers: - - timed: '{obj:cron}' - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_sonar_triggers}' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: '{obj:gerrit_trigger_file_paths}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - builders: - shell: !include-raw-escape: # Workaround issue where the tox run later breaks the lftools virtualenv. @@ -317,6 +328,18 @@ # yamllint disable-line rule:key-duplicates <<: *lf_tox_sonar + ###################### + # Default parameters # + ###################### + + gerrit_sonar_triggers: + - comment-added-contains-event: + comment-contains-value: run-sonar$ + + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -326,6 +349,24 @@ submodule-recursive: '{submodule-recursive}' choosing-strategy: default + triggers: + - timed: '{obj:cron}' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_sonar_triggers}' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + - job-template: name: '{project-name}-tox-sonar' id: github-tox-sonar @@ -334,8 +375,10 @@ <<: *lf_tox_sonar properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' - github: - url: '{git-url}/{github-org}/{project}' + url: '{github-url}/{github-org}/{project}' scm: - lf-infra-github-scm: @@ -347,17 +390,15 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^run-sonar$' only-trigger-phrase: false status-context: 'Python Sonar' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + white-list-target-branches: + - '{branch}' + included-regions: '{obj:github_included_regions}' ############## # Tox Verify # @@ -373,13 +414,24 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false git-url: '$GIT_URL/$GERRIT_PROJECT' + github-url: 'https://github.com' + parallel: true python-version: python2 stream: master submodule-recursive: true tox-dir: '' tox-envs: '' + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*' + ##################### # Job Configuration # ##################### @@ -387,6 +439,7 @@ project-type: freestyle node: '{build-node}' concurrent: true + disabled: '{disable-job}' properties: - lf-infra-properties: @@ -401,6 +454,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: @@ -408,11 +465,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' builders: - - shell: !include-raw-escape: - # Workaround issue where the tox run later breaks the lftools virtualenv. - # Without running the install first the run in the publisher will fail - # due to missing lftools because it gets installed into a tox venv. - - ../shell/lftools-install.sh + - lf-infra-pre-build - lf-infra-tox-install: python-version: '{python-version}' - shell: !include-raw-escape: ../shell/tox-run.sh @@ -437,12 +490,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**' - - parallel: true + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -457,13 +505,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}' @@ -483,8 +524,10 @@ <<: *lf_tox_verify properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' - github: - url: '{git-url}/{github-org}/{project}' + url: '{github-url}/{github-org}/{project}' scm: - lf-infra-github-scm: @@ -497,9 +540,11 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false - status-context: 'JJB Verify' + status-context: 'Tox Verify' permit-all: true github-hooks: true - auto-close-on-fail: false + white-list-target-branches: + - '{branch}' + included-regions: '{obj:github_included_regions}'