X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily-jobs.yaml;h=1c622acf2c4e477c68179ff832012efb337b7153;hb=d749498306d9f12c6c8a0087edd57e66bae7484f;hp=4df3f520dc575049675d2127b258a3f934fa4d53;hpb=afff1f88a918215eeb9060c4f43c5a332c8eb32c;p=releng.git

diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
index 4df3f520d..1c622acf2 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ b/jjb/yardstick/yardstick-daily-jobs.yaml
@@ -15,11 +15,28 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
+    gambia: &gambia
+      stream: gambia
+      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}'
-      docker-tag: 'stable'
+      # 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
     # -------------------------------
@@ -40,6 +57,16 @@
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
+      - virtual:
+          slave-label: apex-virtual-master
+          installer: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
+      - baremetal:
+          slave-label: apex-baremetal-master
+          installer: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
       - virtual:
           slave-label: apex-virtual-fraser
           installer: apex
@@ -65,12 +92,12 @@
           slave-label: fuel-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *gambia
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *gambia
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -86,12 +113,12 @@
           slave-label: armband-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *gambia
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *gambia
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -134,6 +161,16 @@
           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
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -167,7 +204,7 @@
           slave-label: '{pod}'
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *gambia
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -288,7 +325,7 @@
 
     publishers:
       - email:
-          recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com
+          recipients: jean.gaoliang@huawei.com limingjiang@huawei.com
       - email-jenkins-admins-on-failure
 
 ########################