diff options
| -rw-r--r-- | docs/development/overview/testing.rst | 14 | ||||
| -rw-r--r-- | doctor_tests/installer/apex.py | 2 | ||||
| -rw-r--r-- | doctor_tests/scenario/common.py | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/docs/development/overview/testing.rst b/docs/development/overview/testing.rst index 08a4d933..8d0e90e6 100644 --- a/docs/development/overview/testing.rst +++ b/docs/development/overview/testing.rst @@ -76,22 +76,18 @@ Functest container. You can run the Doctor test with the following steps: .. code-block:: bash DOCKER_TAG=latest - docker pull opnfv/functest:${DOCKER_TAG} + docker pull docker.io/opnfv/functest-features:${DOCKER_TAG} docker run --privileged=true -id \ -e INSTALLER_TYPE=${INSTALLER_TYPE} \ -e INSTALLER_IP=${INSTALLER_IP} \ -e INSPECTOR_TYPE=sample \ - -e PYTHON_ENABLE=True \ - opnfv/functest:${DOCKER_TAG} /bin/bash - docker exec <container_id> python /home/opnfv/repos/functest/functest/ci/prepare_env.py start - docker exec <container_id> functest testcase run doctor - -Add an environment variable *PYTHON_ENABLE* to indicate that using Python or -Bash to run the test when start the docker container. + docker.io/opnfv/functest-features:${DOCKER_TAG} /bin/bash + docker exec <container_id> functest env prepare + docker exec <container_id> functest testcase run doctor-notification See `Functest Userguide`_ for more information. -.. _Functest Userguide: http://artifacts.opnfv.org/functest/docs/userguide/index.html +.. _Functest Userguide: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/userguide/index.html For testing with stable version, change DOCKER_TAG to 'stable' or other release tag identifier. diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py index b64a3662..16f0376e 100644 --- a/doctor_tests/installer/apex.py +++ b/doctor_tests/installer/apex.py @@ -93,7 +93,7 @@ class ApexInstaller(BaseInstaller): def setup_stunnel(self): self.log.info('Setup ssh stunnel in controller nodes in Apex installer......') for node_ip in self.controllers: - cmd = "sudo ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 2>&1 < /dev/null &" \ + cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 2>&1 < /dev/null &" \ % (self.key_file, self.node_user_name, node_ip, self.conf.consumer.port, self.conf.consumer.port, node_ip) server = subprocess.Popen(cmd, shell=True) diff --git a/doctor_tests/scenario/common.py b/doctor_tests/scenario/common.py index ebf0cf58..a7240c00 100644 --- a/doctor_tests/scenario/common.py +++ b/doctor_tests/scenario/common.py @@ -6,8 +6,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import os - from doctor_tests.common.utils import match_rep_in_file |