This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-ducktape by this push:
new bca8bfe IGNITE-13789 Add 2.9.0 version to ducktape tests (#8536)
bca8bfe is described below
commit bca8bfe341a539eb5d6efa4e00f941b57aff3dc2
Author: Mikhail Filatov <mi...@inspirational.ru>
AuthorDate: Wed Dec 9 14:12:49 2020 +0300
IGNITE-13789 Add 2.9.0 version to ducktape tests (#8536)
---
modules/ducktests/tests/docker/Dockerfile | 2 +-
modules/ducktests/tests/docker/run_tests.sh | 2 --
modules/ducktests/tests/ignitetest/tests/client_test.py | 6 +++---
.../tests/ignitetest/tests/control_utility/baseline_test.py | 10 +++++-----
.../tests/ignitetest/tests/control_utility/tx_test.py | 8 ++++----
modules/ducktests/tests/ignitetest/utils/version.py | 8 ++++++--
6 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index 9467da7..89cc3b1 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/tests/docker/Dockerfile
@@ -49,7 +49,7 @@ ARG APACHE_MIRROR="https://apache-mirror.rbc.ru/pub/apache/";
ARG APACHE_ARCHIVE="https://archive.apache.org/dist/";
# Install binary test dependencies.
-RUN for v in "2.7.6" "2.8.0" "2.8.1"; \
+RUN for v in "2.7.6" "2.8.0" "2.8.1" "2.9.0"; \
do cd /opt; \
curl -O $APACHE_ARCHIVE/ignite/$v/apache-ignite-$v-bin.zip;\
unzip apache-ignite-$v-bin.zip && mv /opt/apache-ignite-$v-bin
/opt/ignite-$v;\
diff --git a/modules/ducktests/tests/docker/run_tests.sh
b/modules/ducktests/tests/docker/run_tests.sh
index 93a8b7c..bf20488 100755
--- a/modules/ducktests/tests/docker/run_tests.sh
+++ b/modules/ducktests/tests/docker/run_tests.sh
@@ -63,8 +63,6 @@ The options are as follows:
-p|--param
Use specified param to inject in tests. Could be used multiple times.
- ./run_tests.sh --param version=2.8.1
-
-pj|--params-json
Use specified json as parameters to inject in tests. Can be extended with
-p|--param.
diff --git a/modules/ducktests/tests/ignitetest/tests/client_test.py
b/modules/ducktests/tests/ignitetest/tests/client_test.py
index 2da41d5..28b1213 100644
--- a/modules/ducktests/tests/ignitetest/tests/client_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/client_test.py
@@ -27,7 +27,7 @@ from ignitetest.services.utils.ignite_configuration import
IgniteConfiguration
from ignitetest.services.utils.ignite_configuration.cache import
CacheConfiguration
from ignitetest.utils import ignite_versions, cluster
from ignitetest.utils.ignite_test import IgniteTest
-from ignitetest.utils.version import DEV_BRANCH, V_2_8_1, IgniteVersion
+from ignitetest.utils.version import DEV_BRANCH, LATEST, IgniteVersion
# pylint: disable=W0223
@@ -49,7 +49,7 @@ class ClientTest(IgniteTest):
# pylint: disable=R0913
@cluster(num_nodes=7)
- @ignite_versions(str(V_2_8_1), str(DEV_BRANCH))
+ @ignite_versions(str(LATEST), str(DEV_BRANCH))
@parametrize(num_nodes=7, static_clients=2, temp_client=3,
iteration_count=3, client_work_time=30)
def test_ignite_start_stop_nodes(self, ignite_version, num_nodes,
static_clients, temp_client, iteration_count,
client_work_time):
@@ -62,7 +62,7 @@ class ClientTest(IgniteTest):
# pylint: disable=R0913
@cluster(num_nodes=7)
- @ignite_versions(str(V_2_8_1), str(DEV_BRANCH))
+ @ignite_versions(str(LATEST), str(DEV_BRANCH))
@parametrize(num_nodes=7, static_clients=2, temp_client=3,
iteration_count=3, client_work_time=30)
def test_ignite_kill_start_nodes(self, ignite_version, num_nodes,
static_clients, temp_client, iteration_count,
client_work_time):
diff --git
a/modules/ducktests/tests/ignitetest/tests/control_utility/baseline_test.py
b/modules/ducktests/tests/ignitetest/tests/control_utility/baseline_test.py
index 6a38f7c..8951006 100644
--- a/modules/ducktests/tests/ignitetest/tests/control_utility/baseline_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/control_utility/baseline_test.py
@@ -26,7 +26,7 @@ from
ignitetest.services.utils.ignite_configuration.data_storage import DataRegi
from ignitetest.services.utils.ignite_configuration.discovery import
from_ignite_cluster
from ignitetest.utils import version_if, ignite_versions, cluster
from ignitetest.utils.ignite_test import IgniteTest
-from ignitetest.utils.version import DEV_BRANCH, LATEST_2_8, IgniteVersion,
V_2_8_0
+from ignitetest.utils.version import DEV_BRANCH, LATEST, IgniteVersion, V_2_8_0
# pylint: disable=W0223
@@ -37,7 +37,7 @@ class BaselineTests(IgniteTest):
NUM_NODES = 3
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_baseline_set(self, ignite_version):
"""
Test baseline set.
@@ -73,7 +73,7 @@ class BaselineTests(IgniteTest):
self.__check_nodes_in_baseline(new_node.nodes, baseline)
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_baseline_add_remove(self, ignite_version):
"""
Test add and remove nodes from baseline.
@@ -115,7 +115,7 @@ class BaselineTests(IgniteTest):
self.__check_nodes_not_in_baseline(new_node.nodes, baseline)
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_activate_deactivate(self, ignite_version):
"""
Test activate and deactivate cluster.
@@ -138,7 +138,7 @@ class BaselineTests(IgniteTest):
@cluster(num_nodes=NUM_NODES)
@version_if(lambda version: version >= V_2_8_0)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_baseline_autoadjust(self, ignite_version):
"""
Test activate and deactivate cluster.
diff --git
a/modules/ducktests/tests/ignitetest/tests/control_utility/tx_test.py
b/modules/ducktests/tests/ignitetest/tests/control_utility/tx_test.py
index 0ea9ce9..bc059e5 100644
--- a/modules/ducktests/tests/ignitetest/tests/control_utility/tx_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/control_utility/tx_test.py
@@ -28,7 +28,7 @@ from ignitetest.services.utils.ignite_configuration.cache
import CacheConfigurat
from ignitetest.services.utils.ignite_configuration.discovery import
from_ignite_cluster
from ignitetest.utils import ignite_versions, cluster
from ignitetest.utils.ignite_test import IgniteTest
-from ignitetest.utils.version import DEV_BRANCH, LATEST_2_8, IgniteVersion
+from ignitetest.utils.version import DEV_BRANCH, LATEST, IgniteVersion
# pylint: disable=W0223
@@ -40,7 +40,7 @@ class TransactionsTests(IgniteTest):
CACHE_NAME = "TEST"
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_tx_info(self, ignite_version):
"""
Tests verbose tx info for specific xid.
@@ -66,7 +66,7 @@ class TransactionsTests(IgniteTest):
assert res.label == pick_tx.label
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_kill_tx(self, ignite_version):
"""
Test kill transactions by xid and filter.
@@ -96,7 +96,7 @@ class TransactionsTests(IgniteTest):
.issubset(set(long_tx_2.extract_results("TX_ID")))
@cluster(num_nodes=NUM_NODES)
- @ignite_versions(str(DEV_BRANCH), str(LATEST_2_8))
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
def test_tx_filter(self, ignite_version):
"""
Test filtering transactions list.
diff --git a/modules/ducktests/tests/ignitetest/utils/version.py
b/modules/ducktests/tests/ignitetest/utils/version.py
index 0454597..dec655f 100644
--- a/modules/ducktests/tests/ignitetest/utils/version.py
+++ b/modules/ducktests/tests/ignitetest/utils/version.py
@@ -62,9 +62,13 @@ DEV_BRANCH = IgniteVersion("dev")
V_2_7_6 = IgniteVersion("2.7.6")
LATEST_2_7 = V_2_7_6
-# 2.8.0 versions
+# 2.8.x versions
V_2_8_0 = IgniteVersion("2.8.0")
V_2_8_1 = IgniteVersion("2.8.1")
LATEST_2_8 = V_2_8_1
-LATEST = LATEST_2_8
+# 2.9.x versions
+V_2_9_0 = IgniteVersion("2.9.0")
+LATEST_2_9 = V_2_9_0
+
+LATEST = LATEST_2_9
