X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-project-jobs.yml;h=8fdf8deaed9eb3a09d9b7906d5f14a783ad384fa;hb=c03f3dfde5a107fe00c3766b4f6e4651aa3a2100;hp=0ba8e3ff1d92ca08b32a6d32251c34b39e135a61;hpb=e09952c1e3ad16537447d2f732403af4dd6a32ed;p=releng.git diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 0ba8e3ff1..8fdf8deae 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -13,14 +13,13 @@ branch: '{stream}' gs-pathname: '' disabled: false - - brahmaputra: + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false jobs: - 'fuel-build-daily-{stream}' - - 'fuel-verify-build-{stream}' - 'fuel-merge-build-{stream}' - 'fuel-merge-deploy-virtual-{stream}' - 'fuel-deploy-generic-daily-{stream}' @@ -31,6 +30,8 @@ - job-template: name: 'fuel-build-daily-{stream}' + disabled: '{obj:disabled}' + concurrent: false properties: @@ -38,24 +39,29 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: project: '{project}' - - 'ericsson-build-defaults' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' + - choice: + name: FORCE_BUILD + choices: + - 'false' + - 'true' + description: "Force build even if there is no changes in fuel repo. Default false" - fuel-project-parameter: gs-pathname: '{gs-pathname}' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm triggers: - - pollscm: - cron: '0 H/4 * * *' + - timed: '0 H/4 * * *' wrappers: - timeout: @@ -72,73 +78,7 @@ publishers: - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com - -- job-template: - name: 'fuel-verify-build-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'ericsson-build-defaults' - - '{installer}-defaults' - - fuel-project-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - users: '{ssh-credentials}' - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - trigger-on: - - 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' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'ci/**' - - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'deploy/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true - - builders: - - shell: - !include-raw-escape: ./fuel-build.sh - - shell: - !include-raw-escape: ./fuel-workspace-cleanup.sh + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com - job-template: name: 'fuel-merge-build-{stream}' @@ -152,26 +92,23 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm wrappers: - - ssh-agent-credentials: - users: '{ssh-credentials}' + - ssh-agent-wrapper - timeout: timeout: 360 fail: true triggers: - gerrit: + server-name: 'gerrit.opnfv.org' trigger-on: - change-merged-event - comment-added-contains-event: @@ -213,6 +150,7 @@ enabled: true max-total: 2 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -225,23 +163,20 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'virtual-defaults': + - 'fuel-virtual-defaults': installer: '{installer}' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + - git-scm wrappers: - - ssh-agent-credentials: - users: '{ssh-credentials}' + - ssh-agent-wrapper triggers: - gerrit: + server-name: 'gerrit.opnfv.org' trigger-on: - change-merged-event - comment-added-contains-event: @@ -274,41 +209,54 @@ publishers: - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com - job-template: name: 'fuel-deploy-generic-daily-{stream}' - concurrent: false + concurrent: true - disabled: false + disabled: '{obj:disabled}' properties: - throttle: enabled: true - max-total: 1 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-os-.*?-ericsson-pod2-daily-{stream}' + - 'fuel-os-.*?-daily-.*' + - 'fuel-deploy-generic-daily-.*' + block-level: 'NODE' parameters: - project-parameter: project: '{project}' - - 'ericsson-pod2-defaults' + - gerrit-parameter: + branch: '{branch}' - '{installer}-defaults' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - ericsson-pod2 + - lf-pod2 + - ericsson-pod1 + default-slaves: + - ericsson-pod2 - fuel-project-parameter: gs-pathname: '{gs-pathname}' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm wrappers: - build-name: