summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/exec_test.sh13
-rw-r--r--ci/testcases.yaml8
-rw-r--r--docs/userguide/troubleshooting.rst2
-rwxr-xr-xtestcases/OpenStack/healthcheck/healthcheck.sh13
4 files changed, 29 insertions, 7 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 0bb8389d5..8c87160ea 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -83,7 +83,10 @@ function run_test(){
${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh
# push results to the DB in case of CI
- if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then
+ if [[ "$report" == "-r" &&
+ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" &&
+ -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] &&
+ env | grep NODE_NAME > /dev/null; then
odl_logs="/home/opnfv/functest/results/odl/logs/2"
odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
@@ -126,7 +129,13 @@ function run_test(){
python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py
;;
"ovno")
- ${repos_dir}/ovno/Testcases/RunTests.sh
+ # suite under rewritting for colorado
+ # no need to run anything until refactoring done
+ # ${repos_dir}/ovno/Testcases/RunTests.sh
+ ;;
+ "security_scan")
+ # TODO
+ # call you script here....
;;
*)
echo "The test case '${test_name}' does not exist."
diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 962d963b5..4cbc00add 100644
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -132,6 +132,14 @@ tiers:
installer: '(fuel)|(apex)'
scenario: 'bgpvpn'
+ -
+ name: security_scan
+ description: >-
+ Simple security Scan
+ dependencies:
+ installer: 'apex'
+ scenario: ''
+
-
name: openstack
order: 4
diff --git a/docs/userguide/troubleshooting.rst b/docs/userguide/troubleshooting.rst
index 406aaad2a..99b92977b 100644
--- a/docs/userguide/troubleshooting.rst
+++ b/docs/userguide/troubleshooting.rst
@@ -89,7 +89,7 @@ is not **ACTIVE**), you can check why it failed by doing::
It might show some messages about the booting failure. To try that manually::
- nova boot --flavor 2 --image functest-vping --nic net-id=<NET_ID> nova-test
+ nova boot --flavor m1.small --image functest-vping --nic net-id=<NET_ID> nova-test
This will spawn a VM using the network created previously manually.
In all the OPNFV tested scenarios from CI, it never has been a problem with the
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 611c100c5..d9a83a2af 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -182,13 +182,18 @@ info "...Neutron OK!"
info "Testing Nova API..."
#################################
-nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_1}
+# This delay should be removed after resolving Jira case APEX-149.
+# The purpose is to give some time to populate openflow rules
+# by SDN controller in case of odl_l2 scenario.
+sleep 60
+
+nova boot --flavor m1.small --image ${image_1} --nic net-id=${net1_id} ${instance_1}
debug "nova instance '${instance_1}' booted on ${net_1}."
-nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_2}
+nova boot --flavor m1.small --image ${image_1} --nic net-id=${net1_id} ${instance_2}
debug "nova instance '${instance_2}' booted on ${net_1}."
-nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_3}
+nova boot --flavor m1.small --image ${image_2} --nic net-id=${net2_id} ${instance_3}
debug "nova instance '${instance_3}' booted on ${net_2}."
-nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_4}
+nova boot --flavor m1.small --image ${image_2} --nic net-id=${net2_id} ${instance_4}
debug "nova instance '${instance_4}' booted on ${net_2}."
vm1_id=$(nova list | grep ${instance_1} | awk '{print $2}')