diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/container4nfv/container4nfv-project.yml | 10 | ||||
| -rw-r--r-- | jjb/container4nfv/yardstick-arm64.yml | 5 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 90 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 28 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 11 |
6 files changed, 32 insertions, 116 deletions
diff --git a/jjb/container4nfv/container4nfv-project.yml b/jjb/container4nfv/container4nfv-project.yml index 1ab50ae30..4bd2a80a2 100644 --- a/jjb/container4nfv/container4nfv-project.yml +++ b/jjb/container4nfv/container4nfv-project.yml @@ -18,6 +18,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -36,7 +40,8 @@ - string: name: GIT_BASE 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." + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." # yamllint enable rule:line-length - 'opnfv-build-ubuntu-defaults' @@ -134,7 +139,8 @@ - string: name: GIT_BASE 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." + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." # yamllint enable rule:line-length - node: name: SLAVE_NAME diff --git a/jjb/container4nfv/yardstick-arm64.yml b/jjb/container4nfv/yardstick-arm64.yml index 9b8b271df..6ed345ecc 100644 --- a/jjb/container4nfv/yardstick-arm64.yml +++ b/jjb/container4nfv/yardstick-arm64.yml @@ -15,6 +15,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + fraser: &fraser + stream: fraser + branch: '{stream}' + gs-pathname: 'stable/{stream}' + docker-tag: 'stable' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 730c7fcb1..c3760a739 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -36,86 +36,10 @@ arch: 'aarch64' jobs: - - 'doctor-verify-{stream}' - - 'doctor-verify-unit-test-{stream}' - 'doctor-verify-{inspector}-{stream}' - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}' - job-template: - name: 'doctor-verify-{stream}' - disabled: '{obj:disabled}' - project-type: 'multijob' - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - scm: - - git-scm-gerrit - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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: 'doctor_tests/**' - - builders: - - shell: | - #!/bin/bash - # we do nothing here as the main stuff will be done - # in phase jobs - echo "Triggering phase jobs!" - - multijob: - name: 'doctor-build-and-unittest' - execution-type: PARALLEL - projects: - - name: 'doctor-verify-unit-test-{stream}' - predefined-parameters: | - PROJECT=$PROJECT - 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 - current-parameters: true - git-revision: true - -- job-template: - name: 'doctor-verify-unit-test-{stream}' - disabled: '{obj:disabled}' - wrappers: - - ssh-agent-wrapper - - build-timeout: - timeout: 60 - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - scm: - - git-scm-gerrit - builders: - - 'doctor-verify-unit-test-builders-macro' - publishers: - - 'doctor-verify-unit-test-publishers-macro' - -- job-template: name: 'doctor-verify-{inspector}-{stream}' disabled: '{obj:disabled}' project-type: 'multijob' @@ -123,7 +47,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'doctor-slave-parameter' scm: - git-scm-gerrit triggers: @@ -281,11 +205,6 @@ # ------------------------------- - builder: - name: 'doctor-verify-unit-test-builders-macro' - builders: - - shell: "tox -e pep8" - -- builder: name: 'doctor-verify-installer-inspector-builders-macro' builders: - 'clean-workspace-log' @@ -322,13 +241,6 @@ artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log' - email-jenkins-admins-on-failure -- publisher: - name: 'doctor-verify-unit-test-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - - archive: - artifacts: '.tox/' - ##################################### # trigger macros diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 5e5b6e18f..a95617ae4 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -20,8 +20,8 @@ dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' dovetail-branch: master gs-pathname: '/{stream}' @@ -54,12 +54,12 @@ slave-label: fuel-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - virtual: slave-label: fuel-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -75,12 +75,12 @@ slave-label: compass-baremetal SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - virtual: slave-label: compass-virtual SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # ------------------------------- # Installers not using labels # CI PODs @@ -102,12 +102,12 @@ slave-label: apex-virtual-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - baremetal: slave-label: apex-baremetal-master SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -123,12 +123,12 @@ slave-label: armband-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - armband-virtual: slave-label: armband-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -156,22 +156,22 @@ slave-label: zte-pod1 SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - zte-pod3: slave-label: zte-pod3 SUT: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - huawei-pod4: slave-label: huawei-pod4 SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - huawei-pod7: slave-label: huawei-pod7 SUT: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # ------------------------------- testsuite: diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 52e5b3794..ae226b665 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -185,6 +185,10 @@ slave-label: '{pod}' installer: daisy <<: *master + - zte-pod9: + slave-label: '{pod}' + installer: daisy + <<: *fraser # ------------------------------- # PODs for verify jobs triggered by each patch upload # - ool-virtual1: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 5f003bf33..ee6357890 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -1005,17 +1005,6 @@ - parameter: name: 'doctor-slave-parameter' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - 'doctor-apex-x86_64' - - 'doctor-fuel-x86_64' - - 'doctor-fuel-aarch64' - - 'doctor-joid-x86_64' - - 'doctor-daisy-x86_64' - default-slaves: - - 'doctor-apex-x86_64' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT |