diff --git a/sahara/tests/integration/README.rst b/sahara/tests/integration/README.rst index 479ec4db..9e77e817 100644 --- a/sahara/tests/integration/README.rst +++ b/sahara/tests/integration/README.rst @@ -50,7 +50,7 @@ should use the corresponding tox env: .. For example, you want to run tests for the Vanilla plugin with the Hadoop -version 2.4.1 and for the HDP plugin with the Hortonworks Data Platform version +version 2.6.0 and for the HDP plugin with the Hortonworks Data Platform version 1.3.2. In this case you should use the following tox env: .. sourcecode:: console @@ -67,7 +67,7 @@ version 1.2.1. More info about transient cluster see in section ``Contents``. ``tox -e integration -- hdp`` will run tests for the HDP plugin. ``tox -e integration -- transient vanilla2 hdp`` will run test for transient -cluster, tests for the Vanilla plugin with the Hadoop version 2.4.1 and tests +cluster, tests for the Vanilla plugin with the Hadoop version 2.6.0 and tests for the HDP plugin with the Hortonworks Data Platform version 1.3.2. Contents @@ -133,7 +133,7 @@ The Vanilla plugin with the Hadoop version 1.2.1 has the following checks: 7. Cluster scaling. 8. Transient cluster. -The Vanilla plugin with the Hadoop version 2.4.1 has the following checks: +The Vanilla plugin with the Hadoop version 2.6.0 has the following checks: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1. Proper cluster creation. diff --git a/sahara/tests/integration/configs/config.py b/sahara/tests/integration/configs/config.py index c2beb4ab..9d09b3aa 100644 --- a/sahara/tests/integration/configs/config.py +++ b/sahara/tests/integration/configs/config.py @@ -249,14 +249,14 @@ VANILLA_TWO_CONFIG_OPTS = [ 'then image for cluster creation will be chosen by ' 'tag "sahara_i_tests".'), cfg.StrOpt('HADOOP_VERSION', - default='2.4.1', + default='2.6.0', help='Version of Hadoop.'), cfg.StrOpt('HADOOP_USER', default='hadoop', help='Username which is used for access to Hadoop services.'), cfg.StrOpt('HADOOP_EXAMPLES_JAR_PATH', default='/opt/hadoop/share/hadoop/mapreduce/' - 'hadoop-mapreduce-examples-2.4.1.jar', + 'hadoop-mapreduce-examples-2.6.0.jar', help='Path to hadoop examples jar file.'), cfg.StrOpt('HADOOP_LOG_DIRECTORY', default='/mnt/yarn/logs/userlogs',