summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/functest-alpine.sh15
-rw-r--r--jjb/functest/functest-daily-jobs.yml4
-rw-r--r--jjb/functest/functest-weekly-jobs.yml8
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