diff options
| -rw-r--r-- | jjb/apex/apex.yml | 61 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 19 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 15 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 23 |
5 files changed, 98 insertions, 28 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index df65e9a5a..8a5a82f13 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -2,6 +2,7 @@ name: apex jobs: - 'apex-verify-{stream}' + - 'apex-verify-unit-tests-{stream}' - 'apex-runner-{platform}-{scenario}-{stream}' - 'apex-runner-cperf-{stream}' - 'apex-build-{stream}' @@ -68,6 +69,62 @@ - 'baremetal' - 'virtual' +# Unit Test +- job-template: + name: 'apex-verify-unit-tests-{stream}' + + node: '{verify-slave}' + + concurrent: true + + parameters: + - apex-parameter: + gs-pathname: '{gs-pathname}' + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'true' + - 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: 'apex' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'tests/**' + properties: + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'apex-unit-test' + # Verify - job-template: name: 'apex-verify-{stream}' @@ -837,6 +894,10 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." - string: + name: GS_PATHNAME + default: '{gs-pathname}' + description: "Version directory where opnfv artifacts are stored in gs repository" + - string: name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 2662cb7c0..f4bdbdd45 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,13 +21,13 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'opnfv-build' - 'build': slave-label: 'opnfv-build-ubuntu' - 'deploy-virtual': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' - 'smoke-test': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' ##################################### # jobs ##################################### @@ -50,14 +50,7 @@ - throttle: enabled: true max-total: 4 - max-per-node: 1 option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'fuel-verify-master' - - 'fuel-verify-colorado' - block-level: 'NODE' scm: - gerrit-trigger-scm: @@ -108,7 +101,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'fuel-virtual-defaults' + - 'opnfv-build-defaults' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -154,7 +147,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true - multijob: @@ -168,7 +161,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 87a45f1e5..8e3de3d75 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -88,6 +88,14 @@ slave-label: '{pod}' installer: apex <<: *master + - apex-verify-colorado: + slave-label: '{pod}' + installer: apex + <<: *colorado + - apex-daily-colorado: + slave-label: '{pod}' + installer: apex + <<: *colorado #-------------------------------- # None-CI PODs #-------------------------------- diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 019148a96..562a9dae9 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -254,6 +254,21 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - parameter: + name: 'opnfv-build-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: name: 'huawei-build-defaults' parameters: - node: diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index 1123d27fb..d454b0f07 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -13,27 +13,20 @@ stream: master branch: '{stream}' gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra - branch: 'stable/{stream}' - gs-pathname: '{stream}' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# master #-------------------------------- pod: - dell-pod1: installer: compass - auto-trigger-name: 'qtip-daily-dell-pod1-trigger' - <<: *brahmaputra + auto-trigger-name: 'daily-trigger-disabled' + <<: *master - orange-pod2: installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- + <<: *master - juniper-pod1: installer: joid <<: *master @@ -172,10 +165,10 @@ #trigger macros ################# -- trigger: - name: 'qtip-daily-dell-pod1-trigger' - triggers: - - timed: '0 3 * * *' +#- trigger: +# name: 'qtip-daily-dell-pod1-trigger' +# triggers: +# - timed: '0 3 * * *' #- trigger: # name: 'qtip-daily-juniper-pod1-trigger' |