X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yml;h=4c54b735a2faf2f11d7e8b1f655ad47978cf6496;hb=c7c82f49e1af644542b2a5fbde8f870eee9c9ff5;hp=ff1d47eb4172b90d2fa4f6958ad684e8576b7150;hpb=e8d521f3fcfd0f6e4b982dc82049adcd86865a13;p=releng.git diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index ff1d47eb4..4c54b735a 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -14,8 +14,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - danube: &danube - stream: danube + euphrates: &euphrates + stream: euphrates branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' @@ -28,6 +28,27 @@ # that have been switched using labels for slaves #-------------------------------- pod: +# apex CI PODs + - virtual: + slave-label: apex-virtual-master + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: apex-baremetal-master + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: apex-virtual-euphrates + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *euphrates + - baremetal: + slave-label: apex-baremetal-euphrates + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *euphrates # fuel CI PODs - baremetal: slave-label: fuel-baremetal @@ -43,12 +64,12 @@ slave-label: fuel-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - virtual: slave-label: fuel-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -64,12 +85,12 @@ slave-label: armband-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - armband-virtual: slave-label: armband-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -85,13 +106,12 @@ slave-label: joid-baremetal installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - virtual: slave-label: joid-virtual installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *danube - + <<: *euphrates # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -107,28 +127,12 @@ slave-label: compass-baremetal installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - virtual: slave-label: compass-virtual installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *danube -#-------------------------------- -# Installers not using labels -# CI PODs -# This section should only contain the installers -# that have not been switched using labels for slaves -#-------------------------------- - - lf-pod1: - slave-label: '{pod}' - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - lf-pod1: - slave-label: '{pod}' - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates #-------------------------------- # None-CI PODs #-------------------------------- @@ -146,7 +150,7 @@ slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - zte-pod2: slave-label: '{pod}' installer: fuel @@ -161,37 +165,7 @@ 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 - - arm-pod2: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *danube - - arm-pod3: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - arm-pod3: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *danube - - arm-virtual1: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - arm-virtual1: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *danube + <<: *euphrates - orange-pod2: slave-label: '{pod}' installer: joid @@ -212,6 +186,11 @@ installer: compass auto-trigger-name: 'daily-trigger-disabled' <<: *master + - flex-pod1: + slave-label: '{pod}' + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master #-------------------------------- testsuite: - 'daily' @@ -276,13 +255,15 @@ - description-setter: description: "POD: $NODE_NAME" - 'yardstick-cleanup' - #- 'yardstick-fetch-os-creds' + - 'yardstick-fetch-os-creds' + - 'yardstick-fetch-k8s-conf' - 'yardstick-{testsuite}' - 'yardstick-store-results' publishers: - email: recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com + - email-jenkins-admins-on-failure ######################## # builder macros @@ -305,6 +286,12 @@ - shell: !include-raw: ../../utils/fetch_os_creds.sh +- builder: + name: yardstick-fetch-k8s-conf + builders: + - shell: + !include-raw: ./yardstick-get-k8s-conf.sh + - builder: name: yardstick-store-results builders: @@ -320,94 +307,91 @@ # parameter macros ######################## - parameter: - name: 'yardstick-params-fuel-baremetal' + name: 'yardstick-params-apex-virtual-master' 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-fuel-virtual' + name: 'yardstick-params-apex-baremetal-master' 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-baremetal' + name: 'yardstick-params-apex-virtual-euphrates' 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' + name: 'yardstick-params-apex-baremetal-euphrates' 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-virtual1' + name: 'yardstick-params-fuel-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-joid-baremetal' + name: 'yardstick-params-fuel-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-virtual' + 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-intel-pod8' + 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-lf-pod1' + name: 'yardstick-params-joid-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-lf-pod2' + name: 'yardstick-params-joid-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-compass-baremetal' + name: 'yardstick-params-intel-pod8' 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-zte-pod1' + name: 'yardstick-params-compass-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-zte-pod2' + name: 'yardstick-params-zte-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -415,7 +399,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-zte-pod3' + name: 'yardstick-params-zte-pod2' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -423,7 +407,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-orange-pod1' + name: 'yardstick-params-zte-pod3' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -431,7 +415,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-orange-pod2' + name: 'yardstick-params-orange-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -439,7 +423,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-pod2' + name: 'yardstick-params-orange-pod2' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -447,7 +431,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-pod3' + name: 'yardstick-params-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -455,7 +439,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-virtual' + name: 'yardstick-params-compass-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -463,7 +447,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-compass-virtual' + name: 'yardstick-params-huawei-pod3' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -471,7 +455,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-pod3' + name: 'yardstick-params-huawei-pod4' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -479,7 +463,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-pod4' + name: 'yardstick-params-flex-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -498,4 +482,4 @@ - trigger: name: 'yardstick-daily-huawei-pod4-trigger' triggers: - - timed: '0 1 * * *' + - timed: ''