From e15888910403c49c9fdab1d73b6b022b7f47f36f Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 5 Apr 2018 11:06:42 +0200
Subject: Create daily Fraser jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It doesn't assign any Fraser job to (virtual) pods.
It also stops checking deployement what is duplicating healthcheck.

Change-Id: Ia370380e20b833d03f09b2098478a8930e4f8dc0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-alpine.sh       | 15 +++++++--------
 jjb/functest/functest-daily-jobs.yml  |  4 ++++
 jjb/functest/functest-weekly-jobs.yml |  8 +++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index dfadf9a37..72b94bd18 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -28,12 +28,12 @@ check_os_deployment() {
 
 run_tiers() {
     tiers=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -r -t all"
         [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
+    else
+        cmd_opt="run_tests -r -t all"
+        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -58,10 +58,10 @@ run_tiers() {
 
 run_test() {
     test_name=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -t ${test_name}"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -t ${test_name}"
+    else
+        cmd_opt="run_tests -t ${test_name}"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -177,7 +177,6 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_
 
 set +e
 
-[[ ${BRANCH##*/} == "master" ]] && check_os_deployment
 if [ ${FUNCTEST_MODE} == 'testcase' ]; then
     echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
     run_test ${FUNCTEST_SUITE_NAME}
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 8ffbe9e63..b93a56bad 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,6 +14,10 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
+    fraser: &fraser
+      stream: fraser
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'
diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml
index 5d572aacc..d87ac2f76 100644
--- a/jjb/functest/functest-weekly-jobs.yml
+++ b/jjb/functest/functest-weekly-jobs.yml
@@ -16,11 +16,17 @@
       gs-pathname: ''
       docker-tag: 'latest'
       disabled: false
+    fraser: &fraser
+      stream: fraser
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      docker-tag: '{stream}'
+      disabled: false
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      docker-tag: 'stable'
+      docker-tag: '{stream}'
       disabled: false
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
-- 
cgit 1.2.3-korg