diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-04-12 09:42:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-12 09:42:29 +0000 |
| commit | c5ba198398eae4098b07b68b3301d52f9afbebea (patch) | |
| tree | c50917c6e2682c57ed1e02729447d2cd735db423 /jjb/functest | |
| parent | 68fe0434a2f912a823f9982da0f93df193041ad9 (diff) | |
| parent | e5ce0b5f77f47b8b18354697e8d21a3885502915 (diff) | |
Merge "Stop maintaining Euphrates (EOL)"
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yml | 2 |
4 files changed, 7 insertions, 24 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 72b94bd18..440b00af9 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -28,13 +28,8 @@ check_os_deployment() { run_tiers() { tiers=$1 - 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 + cmd_opt="run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -58,11 +53,7 @@ run_tiers() { run_test() { test_name=$1 - if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then - cmd_opt="prepare_env start && run_tests -t ${test_name}" - else - cmd_opt="run_tests -t ${test_name}" - fi + cmd_opt="run_tests -t ${test_name}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case @@ -115,11 +106,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi -if [[ ${BRANCH} == "stable/euphrates" ]]; then - rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds" -else - rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" -fi +rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" # Set iptables rule to allow forwarding return traffic for container if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml index 55999060a..7f8dd8d53 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yml +++ b/jjb/functest/functest-kubernetes-project-jobs.yml @@ -18,11 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 3adf8808c..4468da778 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/xtesting-project-jobs.yml b/jjb/functest/xtesting-project-jobs.yml index 7f4da36ef..e109387c6 100644 --- a/jjb/functest/xtesting-project-jobs.yml +++ b/jjb/functest/xtesting-project-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false |