diff options
Diffstat (limited to 'jjb/sandbox')
| -rw-r--r-- | jjb/sandbox/sandbox-verify-jobs-multijob.yml | 234 | ||||
| -rw-r--r-- | jjb/sandbox/sandbox-verify-jobs.yml | 150 |
2 files changed, 126 insertions, 258 deletions
diff --git a/jjb/sandbox/sandbox-verify-jobs-multijob.yml b/jjb/sandbox/sandbox-verify-jobs-multijob.yml deleted file mode 100644 index 6aa5d50f5..000000000 --- a/jjb/sandbox/sandbox-verify-jobs-multijob.yml +++ /dev/null @@ -1,234 +0,0 @@ -- project: - name: 'sandbox-verify-jobs-multijob' - - project: 'sandbox' - - installer: 'sandbox' -##################################### -# branch definitions -##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - colorado: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: true -##################################### -# patch verification phases -##################################### - phase: - - 'basic': - slave-label: 'opnfv-build-ubuntu' - - 'build': - slave-label: 'opnfv-build-ubuntu' - - 'deploy': - slave-label: 'sandbox-virtual' - - 'test': - slave-label: 'sandbox-virtual' -##################################### -# jobs -##################################### - jobs: - - 'sandbox-verify-{stream}-multijob' - - 'sandbox-verify-{phase}-{stream}-multijob' -##################################### -# job templates -##################################### -- job-template: - name: 'sandbox-verify-{stream}-multijob' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 2 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'sandbox-verify-master-multijob' - - 'sandbox-verify-colorado-multijob' - block-level: 'NODE' - - 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}' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'sandbox-virtual-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'sandbox-verify-basic-{stream}-multijob' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'sandbox-verify-build-{stream}-multijob' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'sandbox-verify-deploy-{stream}-multijob' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: test - condition: SUCCESSFUL - projects: - - name: 'sandbox-verify-test-{stream}-multijob' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'sandbox-verify-{phase}-{stream}-multijob' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 2 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'sandbox-verify-deploy-.*' - - 'sandbox-verify-test-.*' - block-level: 'NODE' - - 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 - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-builder' -##################################### -# builder macros -##################################### -- builder: - name: 'sandbox-verify-basic-builder' - builders: - - shell: - !include-raw: ./basic.sh - -- builder: - name: 'sandbox-verify-build-builder' - builders: - - shell: - !include-raw: ./build.sh - -- builder: - name: 'sandbox-verify-deploy-builder' - builders: - - shell: - !include-raw: ./deploy.sh - -- builder: - name: 'sandbox-verify-test-builder' - builders: - - shell: - !include-raw: ./test.sh diff --git a/jjb/sandbox/sandbox-verify-jobs.yml b/jjb/sandbox/sandbox-verify-jobs.yml index c62bba924..c94bc92bc 100644 --- a/jjb/sandbox/sandbox-verify-jobs.yml +++ b/jjb/sandbox/sandbox-verify-jobs.yml @@ -11,57 +11,54 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: true + disabled: false - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: true ##################################### -# patch verification activities +# patch verification phases ##################################### - activity: + phase: - 'basic': - dependency-jobs: '' slave-label: 'opnfv-build-ubuntu' - 'build': - dependency-jobs: 'sandbox-verify-basic-{stream}' slave-label: 'opnfv-build-ubuntu' - - 'deploy': - dependency-jobs: 'sandbox-verify-build-{stream}' + - 'deploy-virtual': slave-label: 'sandbox-virtual' - - 'test': - dependency-jobs: 'sandbox-verify-deploy-{stream}' + - 'smoke-test': slave-label: 'sandbox-virtual' ##################################### # jobs ##################################### jobs: - - 'sandbox-verify-{activity}-{stream}' + - 'sandbox-verify-{stream}' + - 'sandbox-verify-{phase}-{stream}' ##################################### # job templates ##################################### - job-template: - name: 'sandbox-verify-{activity}-{stream}' + name: 'sandbox-verify-{stream}' + + project-type: multijob disabled: '{obj:disabled}' concurrent: true properties: + - throttle: + enabled: true + max-total: 2 + max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: - - 'sandbox-verify-deploy-.*' - - 'sandbox-verify-test-.*' + - 'sandbox-verify-master' + - 'sandbox-verify-colorado' block-level: 'NODE' - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - '{slave-label}-defaults' - scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -98,12 +95,117 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' readable-message: true - dependency-jobs: '{dependency-jobs}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'sandbox-virtual-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-basic-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: build + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-build-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-deploy-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: test + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-test-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + +- job-template: + name: 'sandbox-verify-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 2 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'sandbox-verify-deploy-.*' + - 'sandbox-verify-test-.*' + block-level: 'NODE' + + 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 + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' builders: - description-setter: description: "Built on $NODE_NAME" - - '{project}-verify-{activity}-macro' + - '{project}-verify-{phase}-macro' ##################################### # builder macros ##################################### @@ -120,13 +222,13 @@ !include-raw: ./build.sh - builder: - name: 'sandbox-verify-deploy-macro' + name: 'sandbox-verify-deploy-virtual-macro' builders: - shell: !include-raw: ./deploy.sh - builder: - name: 'sandbox-verify-test-macro' + name: 'sandbox-verify-smoke-test-macro' builders: - shell: !include-raw: ./test.sh |