diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/exec_test.sh | 8 | ||||
| -rwxr-xr-x | ci/run_tests.py | 2 | ||||
| -rw-r--r-- | ci/testcases.yaml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 03eb2c873..20f7c2d4f 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -44,20 +44,18 @@ function odl_tests(){ keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":") neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":") odl_ip=${neutron_ip} - odl_port=8181 + odl_port=8080 if [ "$INSTALLER_TYPE" == "fuel" ]; then odl_port=8282 elif [ "$INSTALLER_TYPE" == "apex" ]; then odl_ip=$SDN_CONTROLLER_IP + odl_port=8181 elif [ "$INSTALLER_TYPE" == "joid" ]; then odl_ip=$SDN_CONTROLLER - odl_port=8080 - : elif [ "$INSTALLER_TYPE" == "compass" ]; then - : + odl_port=8181 else odl_ip=$SDN_CONTROLLER_IP - odl_port=8080 fi } diff --git a/ci/run_tests.py b/ci/run_tests.py index 758a87c2d..982567217 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -102,7 +102,7 @@ def run_test(test, tier_name): cmd = ("%s%s" % (EXEC_SCRIPT, flags)) logger.debug("Executing command '%s'" % cmd) - result = ft_utils.execute_command(cmd, logger, exit_on_error=False) + result = ft_utils.execute_command(cmd, exit_on_error=False) if CLEAN_FLAG: cleanup() diff --git a/ci/testcases.yaml b/ci/testcases.yaml index aebb2d04c..7b7a7d14d 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -151,7 +151,7 @@ tiers: Simple security Scan dependencies: installer: 'apex' - scenario: 'disable' + scenario: '' - name: copper |