X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-project-jobs.yml;h=588ab0cd591406dc420d664399447e17eb1d8015;hb=cbd3ef027f124e6f7a684f397e81cd5d895b707c;hp=95bc3a6b41b5c6911bdc5e4eaccfc6b7b2204f26;hpb=ab273f3fb5bdb3afcd240c09d4a69a5081b3bb93;p=releng.git diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 95bc3a6b4..588ab0cd5 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -12,13 +12,14 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - 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}' @@ -29,6 +30,8 @@ - job-template: name: 'fuel-build-daily-{stream}' + disabled: '{obj:disabled}' + concurrent: false properties: @@ -36,12 +39,19 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: project: '{project}' - - 'ericsson-ca-build-1-defaults' + - '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}' @@ -52,8 +62,7 @@ branch: '{branch}' triggers: - - pollscm: - cron: '0 H/4 * * *' + - timed: '0 H/4 * * *' wrappers: - timeout: @@ -70,24 +79,21 @@ 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-verify-build-{stream}' + name: 'fuel-merge-build-{stream}' - concurrent: true + disabled: '{obj:disabled}' - properties: - - throttle: - enabled: true - max-total: 3 + concurrent: true parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-ca-build-1-defaults' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -95,12 +101,13 @@ scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '' + choosing-strategy: 'default' wrappers: - ssh-agent-credentials: - users: '{ssh-credentials}' + users: + - '{ssh-credentials}' - timeout: timeout: 360 fail: true @@ -108,31 +115,38 @@ 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' + - change-merged-event - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' project-pattern: '{project}' branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - readable-message: true + - 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/**' builders: - shell: !include-raw-escape: ./fuel-build.sh + - shell: + !include-raw-escape: ./fuel-upload-artifact.sh - shell: !include-raw-escape: ./fuel-workspace-cleanup.sh - job-template: - name: 'fuel-merge-build-{stream}' + name: 'fuel-merge-deploy-virtual-{stream}' + + disabled: true concurrent: true @@ -140,13 +154,22 @@ - throttle: enabled: true max-total: 2 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-os-.*?-virtual-daily-.*' + - 'fuel-merge-deploy-virtual-.*' + block-level: 'NODE' parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-ca-build-1-defaults' + - 'fuel-virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -158,10 +181,8 @@ wrappers: - ssh-agent-credentials: - users: '{ssh-credentials}' - - timeout: - timeout: 360 - fail: true + users: + - '{ssh-credentials}' triggers: - gerrit: @@ -175,89 +196,69 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - - builders: - - shell: - !include-raw-escape: ./fuel-build.sh - - shell: - !include-raw-escape: ./fuel-upload-artifact.sh - - shell: - !include-raw-escape: ./fuel-workspace-cleanup.sh - -- job-template: - name: 'fuel-merge-deploy-virtual-{stream}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 2 - max-per-node: 1 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'fuel-deploy-virtual-defaults' - - '{installer}-defaults' - - fuel-project-parameter: - gs-pathname: '{gs-pathname}' - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - ssh-agent-credentials: - users: '{ssh-credentials}' - -# triggers: -# - gerrit: -# trigger-on: -# - change-merged-event -# - comment-added-contains-event: -# comment-contains-value: 'remerge' -# projects: -# - project-compare-type: 'ANT' -# project-pattern: '{project}' -# branches: -# - branch-compare-type: 'ANT' -# branch-pattern: '**/{branch}' -# dependency-jobs: 'fuel-merge-build-{stream}' + 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/**' + dependency-jobs: 'fuel-merge-build-{stream}' builders: - shell: !include-raw-escape: ./fuel-download-artifact.sh - shell: - !include-raw-escape: ./fuel-deploy-virtual.sh + !include-raw-escape: ./fuel-deploy.sh - shell: !include-raw-escape: ./fuel-workspace-cleanup.sh 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: true + 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-.*?-daily-.*' + - 'fuel-deploy-generic-daily-.*' + block-level: 'NODE' parameters: - project-parameter: project: '{project}' - - 'ericsson-pod2-defaults' - '{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}' @@ -269,7 +270,7 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + name: '$BUILD_NUMBER - POD: $NODE_NAME Scenario: $DEPLOY_SCENARIO' builders: - shell: