X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yaml;h=e12eee79f4e1c90a52ff21b082ee0ea911e32a8d;hb=824a278e82c9bc5217d6f7c3d99511eb23334f70;hp=1c622acf2c4e477c68179ff832012efb337b7153;hpb=d5cce0e2a7d4d75c8c056651ab5f2a36454a8145;p=releng.git diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 1c622acf2..e12eee79f 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -15,28 +15,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - gambia: &gambia - stream: gambia + hunter: &hunter + stream: hunter branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' - # Temporary fraser entry, until all fraser-tied PODs below migrate to gambia - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '{stream}' - # In the meantime, docker image 'stable' will carry gambia contents, and - # there is no implemented way to build a docker image with 'fraser' tag. - # Available docker image tag options, as of 2018-10-03: - # - 'opnfv-6.2.1', built on 2018-07-02, is rather old. - # - 'ovp-2.0.0', built on 2018-09-21, is a good fit despite its name: it - # was built using SHA1 6c10a2d9cc3fe10e0bdd73a0985ab767b9479afc, which - # is the same as used for the most recent 'stable' docker image carrying - # fraser contents, built on 2018-09-13 and used so far by the fraser- - # tied PODs below. - # The alternative would be to create a new 'opnfv-6.2.2' git tag, but that - # would just build another image using the same SHA1 as for 'ovp-2.0.0'. - docker-tag: 'ovp-2.0.0' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -61,22 +44,12 @@ slave-label: apex-virtual-master installer: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - baremetal: slave-label: apex-baremetal-master installer: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: apex-virtual-fraser - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: apex-baremetal-fraser - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter # fuel CI PODs - baremetal: slave-label: fuel-baremetal @@ -92,12 +65,12 @@ slave-label: fuel-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - virtual: slave-label: fuel-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -113,12 +86,12 @@ slave-label: armband-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - armband-virtual: slave-label: armband-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -134,43 +107,12 @@ slave-label: joid-baremetal installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: joid-virtual installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # daisy CI PODs - baremetal: slave-label: daisy-baremetal @@ -181,7 +123,7 @@ slave-label: daisy-baremetal installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: daisy-virtual installer: daisy @@ -195,6 +137,11 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master + - itri-pod1: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master - zte-pod1: slave-label: '{pod}' installer: fuel @@ -204,7 +151,7 @@ slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - zte-pod2: slave-label: '{pod}' installer: daisy @@ -219,7 +166,7 @@ slave-label: '{pod}' installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - zte-pod9: slave-label: '{pod}' installer: daisy @@ -229,27 +176,12 @@ slave-label: '{pod}' installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - orange-pod2: slave-label: '{pod}' installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master - - huawei-pod3: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger' - <<: *master - - huawei-pod4: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' - <<: *master - - baremetal-centos: - slave-label: 'intel-pod8' - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - flex-pod1: slave-label: '{pod}' installer: apex @@ -387,7 +319,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-apex-virtual-fraser' + name: 'yardstick-params-apex-virtual-hunter' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -395,7 +327,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-apex-baremetal-fraser' + name: 'yardstick-params-apex-baremetal-hunter' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -459,7 +391,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-compass-baremetal' + name: 'yardstick-params-daisy-baremetal' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -467,7 +399,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-daisy-baremetal' + name: 'yardstick-params-daisy-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -475,7 +407,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-daisy-virtual' + name: 'yardstick-params-itri-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -538,14 +470,6 @@ default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' -- parameter: - name: 'yardstick-params-compass-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-huawei-pod3' parameters: