X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=709592a8954aa7f09857a3acaa40ed757c56b6ec;hb=32408dd6f7506a2a791bd5c00bf7cd9509961a07;hp=0d2937c1caac1557ee83076f1d000f3a94dea51e;hpb=0346c481830ea9c27e0de97d60f0556431cf3019;p=releng.git diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 0d2937c1c..709592a89 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -1,5 +1,5 @@ ################################### -# job configuration for functest +# job configuration for yardstick ################################### - project: name: yardstick @@ -14,11 +14,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - brahmaputra: &brahmaputra - stream: brahmaputra + danube: &danube + stream: danube branch: 'stable/{stream}' gs-pathname: '{stream}' - docker-tag: 'brahmaputra.1.0' + docker-tag: 'stable' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -43,12 +43,33 @@ slave-label: fuel-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube - virtual: slave-label: fuel-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube +# armband CI PODs + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-virtual: + slave-label: armband-virtual + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube + - armband-virtual: + slave-label: armband-virtual + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -64,12 +85,12 @@ slave-label: joid-baremetal installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube - virtual: slave-label: joid-virtual installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube # compass CI PODs - baremetal: @@ -86,12 +107,12 @@ slave-label: compass-baremetal installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube - virtual: slave-label: compass-virtual installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube #-------------------------------- # Installers not using labels # CI PODs @@ -107,7 +128,7 @@ slave-label: '{pod}' installer: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *brahmaputra + <<: *danube #-------------------------------- # None-CI PODs #-------------------------------- @@ -121,6 +142,11 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master + - zte-pod1: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube - zte-pod2: slave-label: '{pod}' installer: fuel @@ -131,19 +157,34 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - arm-pod1: + - zte-pod3: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube + - arm-pod2: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - orange-pod2: + - arm-pod2: slave-label: '{pod}' - installer: joid + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube + - arm-pod3: + slave-label: '{pod}' + installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - huawei-pod2: + - arm-pod3: slave-label: '{pod}' - installer: compass + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube + - orange-pod2: + slave-label: '{pod}' + installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master - huawei-pod3: @@ -156,6 +197,11 @@ installer: compass auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master + - huawei-pod5: + slave-label: '{pod}' + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master #-------------------------------- testsuite: - 'daily' @@ -174,6 +220,7 @@ concurrent: true properties: + - logrotate-default - throttle: enabled: true max-per-node: 1 @@ -192,8 +239,10 @@ parameters: - project-parameter: project: '{project}' - - '{slave-label}-defaults' + - gerrit-parameter: + branch: '{branch}' - '{installer}-defaults' + - '{slave-label}-defaults' - 'yardstick-params-{slave-label}' - string: name: DEPLOY_SCENARIO @@ -212,10 +261,7 @@ description: "Show debut output information" scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - description-setter: @@ -223,6 +269,7 @@ - 'yardstick-cleanup' #- 'yardstick-fetch-os-creds' - 'yardstick-{testsuite}' + - 'yardstick-store-results' publishers: - email: @@ -249,6 +296,12 @@ - shell: !include-raw: ../../utils/fetch_os_creds.sh +- builder: + name: yardstick-store-results + builders: + - shell: + !include-raw: ../../utils/push-test-logs.sh + - builder: name: yardstick-cleanup builders: @@ -269,7 +322,21 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-armband-baremetal' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-armband-virtual' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-joid-baremetal' @@ -283,14 +350,14 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-intel-pod8' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-lf-pod1' @@ -317,7 +384,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-pod2' + name: 'yardstick-params-huawei-pod5' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -365,7 +432,15 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-pod1' + name: 'yardstick-params-arm-pod2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-arm-pod3' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -377,7 +452,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -385,7 +460,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -393,7 +468,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -401,7 +476,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' #######################