Create functest daily/weekly Fraser Jobs

Though the stream was added it wasn't applied to any of the pod
configurations which are expanded as part of the job names.

Change-Id: I84af2e11033a40f314c8bc0c1f263002bc44bf60
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

2 files changed, 19 insertions, 29 deletions

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index b93a56bad..52e5b3794 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -18,10 +18,6 @@
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -43,11 +39,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -60,11 +56,11 @@
       - baremetal:
           slave-label: joid-baremetal
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -77,11 +73,11 @@
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -92,13 +88,13 @@
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -111,11 +107,11 @@
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -128,11 +124,11 @@
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       # netvirt 3rd party ci
       - virtual:
           slave-label: odl-netvirt-virtual
@@ -168,7 +164,7 @@
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -176,7 +172,7 @@
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
@@ -184,7 +180,7 @@
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod9:
           slave-label: '{pod}'
           installer: daisy
diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml
index d87ac2f76..c88fa0050 100644
--- a/jjb/functest/functest-weekly-jobs.yml
+++ b/jjb/functest/functest-weekly-jobs.yml
@@ -22,12 +22,6 @@
       gs-pathname: '/{stream}'
       docker-tag: '{stream}'
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      docker-tag: '{stream}'
-      disabled: false
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -49,11 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
     # -------------------------------
     jobs:
       - 'functest-{installer}-{pod}-weekly-{stream}'