You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2020/05/28 14:37:33 UTC
[ignite] branch ignite-ducktape updated: Ignite ducktape (#7868)
This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 4bfa3aa Ignite ducktape (#7868)
4bfa3aa is described below
commit 4bfa3aabc6b648216a38370fa78e62b273de146c
Author: Anton Vinogradov <av...@apache.org>
AuthorDate: Thu May 28 17:35:56 2020 +0300
Ignite ducktape (#7868)
* naming -> ducktest
docker clean-up script
codestyle fixes
modules fix
* tests folder relocated
* build.sh
ducktape 0.7.7
2.8.0 from archive
py folder as source root
apache license
* docfix
* travis fix (rat)
build -> gitignore
* newline %)
* minor package refactoring
---
.gitignore | 2 +
modules/ducktests/tests/docker/build/cluster.json | 75 ----------------------
modules/ducktests/tests/docker/build/node_hosts | 7 --
.../ignitetest/{suites => benchmarks}/__init__.py | 0
.../add_node_rebalance_test.py | 0
.../ducktests/tests/ignitetest/services/ignite.py | 4 +-
.../tests/ignitetest/services/ignite_client_app.py | 4 +-
.../ducktests/tests/ignitetest/services/spark.py | 17 ++++-
.../{ignite_utils => services/utils}/__init__.py | 0
.../utils}/ignite_config.py | 0
.../utils}/ignite_path.py | 0
.../tests/ignitetest/{suites => tests}/__init__.py | 0
.../{suites => tests}/spark_integration_test.py | 15 +++++
parent/pom.xml | 1 +
14 files changed, 38 insertions(+), 87 deletions(-)
diff --git a/.gitignore b/.gitignore
index b0cc5b7..2269a3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,7 +108,9 @@ packages
#NodeJs files
/modules/platforms/nodejs/node_modules
+#Ducktape
/results
.ducktape
*.pyc
/tests/venv
+modules/ducktests/tests/docker/build/**
diff --git a/modules/ducktests/tests/docker/build/cluster.json b/modules/ducktests/tests/docker/build/cluster.json
deleted file mode 100644
index 4332532..0000000
--- a/modules/ducktests/tests/docker/build/cluster.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "_comment": [
- "Licensed to the Apache Software Foundation (ASF) under one or more",
- "contributor license agreements. See the NOTICE file distributed with",
- "this work for additional information regarding copyright ownership.",
- "The ASF licenses this file to You under the Apache License, Version 2.0",
- "(the \"License\"); you may not use this file except in compliance with",
- "the License. You may obtain a copy of the License at",
- "",
- "http://www.apache.org/licenses/LICENSE-2.0",
- "",
- "Unless required by applicable law or agreed to in writing, software",
- "distributed under the License is distributed on an \"AS IS\" BASIS,",
- "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
- "See the License for the specific language governing permissions and",
- "limitations under the License."
- ],
- "nodes": [
- {
- "externally_routable_ip": "ducker02",
- "ssh_config": {
- "host": "ducker02",
- "hostname": "ducker02",
- "identityfile": "/home/ducker/.ssh/id_rsa",
- "password": "",
- "port": 22,
- "user": "ducker"
- }
- },
- {
- "externally_routable_ip": "ducker03",
- "ssh_config": {
- "host": "ducker03",
- "hostname": "ducker03",
- "identityfile": "/home/ducker/.ssh/id_rsa",
- "password": "",
- "port": 22,
- "user": "ducker"
- }
- },
- {
- "externally_routable_ip": "ducker04",
- "ssh_config": {
- "host": "ducker04",
- "hostname": "ducker04",
- "identityfile": "/home/ducker/.ssh/id_rsa",
- "password": "",
- "port": 22,
- "user": "ducker"
- }
- },
- {
- "externally_routable_ip": "ducker05",
- "ssh_config": {
- "host": "ducker05",
- "hostname": "ducker05",
- "identityfile": "/home/ducker/.ssh/id_rsa",
- "password": "",
- "port": 22,
- "user": "ducker"
- }
- },
- {
- "externally_routable_ip": "ducker06",
- "ssh_config": {
- "host": "ducker06",
- "hostname": "ducker06",
- "identityfile": "/home/ducker/.ssh/id_rsa",
- "password": "",
- "port": 22,
- "user": "ducker"
- }
- }
- ]
-}
diff --git a/modules/ducktests/tests/docker/build/node_hosts b/modules/ducktests/tests/docker/build/node_hosts
deleted file mode 100644
index 035d22b..0000000
--- a/modules/ducktests/tests/docker/build/node_hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-172.26.0.2 ducker01
-172.26.0.3 ducker02
-172.26.0.4 ducker03
-172.26.0.5 ducker04
-172.26.0.6 ducker05
-172.26.0.7 ducker06
-.60 ignite-4
\ No newline at end of file
diff --git a/modules/ducktests/tests/ignitetest/suites/__init__.py b/modules/ducktests/tests/ignitetest/benchmarks/__init__.py
similarity index 100%
copy from modules/ducktests/tests/ignitetest/suites/__init__.py
copy to modules/ducktests/tests/ignitetest/benchmarks/__init__.py
diff --git a/modules/ducktests/tests/ignitetest/suites/add_node_rebalance_test.py b/modules/ducktests/tests/ignitetest/benchmarks/add_node_rebalance_test.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/suites/add_node_rebalance_test.py
rename to modules/ducktests/tests/ignitetest/benchmarks/add_node_rebalance_test.py
diff --git a/modules/ducktests/tests/ignitetest/services/ignite.py b/modules/ducktests/tests/ignitetest/services/ignite.py
index f864f88..5559059 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite.py
@@ -20,8 +20,8 @@ from ducktape.cluster.remoteaccount import RemoteCommandError
from ducktape.services.service import Service
from ducktape.utils.util import wait_until
-from ignitetest.ignite_utils.ignite_config import IgniteConfig
-from ignitetest.ignite_utils.ignite_path import IgnitePath
+from ignitetest.services.utils.ignite_config import IgniteConfig
+from ignitetest.services.utils.ignite_path import IgnitePath
from ignitetest.version import DEV_BRANCH
diff --git a/modules/ducktests/tests/ignitetest/services/ignite_client_app.py b/modules/ducktests/tests/ignitetest/services/ignite_client_app.py
index 228e76b..2474abc 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite_client_app.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite_client_app.py
@@ -17,8 +17,8 @@ import os
from ducktape.services.background_thread import BackgroundThreadService
-from ignitetest.ignite_utils.ignite_config import IgniteConfig
-from ignitetest.ignite_utils.ignite_path import IgnitePath
+from ignitetest.services.utils.ignite_config import IgniteConfig
+from ignitetest.services.utils.ignite_path import IgnitePath
from ignitetest.version import DEV_BRANCH
"""
diff --git a/modules/ducktests/tests/ignitetest/services/spark.py b/modules/ducktests/tests/ignitetest/services/spark.py
index 58f25a4..9945fd5 100644
--- a/modules/ducktests/tests/ignitetest/services/spark.py
+++ b/modules/ducktests/tests/ignitetest/services/spark.py
@@ -1,9 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
import os.path
from ducktape.cluster.remoteaccount import RemoteCommandError
from ducktape.services.service import Service
-from ignitetest.ignite_utils.ignite_config import IgniteConfig
+from ignitetest.services.utils.ignite_config import IgniteConfig
from ignitetest.services.ignite_client_app import IgniteClientApp, create_client_configs
diff --git a/modules/ducktests/tests/ignitetest/ignite_utils/__init__.py b/modules/ducktests/tests/ignitetest/services/utils/__init__.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/ignite_utils/__init__.py
rename to modules/ducktests/tests/ignitetest/services/utils/__init__.py
diff --git a/modules/ducktests/tests/ignitetest/ignite_utils/ignite_config.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_config.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/ignite_utils/ignite_config.py
rename to modules/ducktests/tests/ignitetest/services/utils/ignite_config.py
diff --git a/modules/ducktests/tests/ignitetest/ignite_utils/ignite_path.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_path.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/ignite_utils/ignite_path.py
rename to modules/ducktests/tests/ignitetest/services/utils/ignite_path.py
diff --git a/modules/ducktests/tests/ignitetest/suites/__init__.py b/modules/ducktests/tests/ignitetest/tests/__init__.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/suites/__init__.py
rename to modules/ducktests/tests/ignitetest/tests/__init__.py
diff --git a/modules/ducktests/tests/ignitetest/suites/spark_integration_test.py b/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
similarity index 59%
rename from modules/ducktests/tests/ignitetest/suites/spark_integration_test.py
rename to modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
index 57c741c..a239a4a 100644
--- a/modules/ducktests/tests/ignitetest/suites/spark_integration_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
from ducktape.tests.test import Test
from ignitetest.services.ignite import IgniteService
diff --git a/parent/pom.xml b/parent/pom.xml
index 1fdccb4..9567c19 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -866,6 +866,7 @@
<exclude>**/keystore/ca/*.txt.attr</exclude><!--auto generated files-->
<exclude>**/keystore/ca/*serial</exclude><!--auto generated files-->
<exclude>**/META-INF/services/**</exclude> <!-- Interface mappings: cannot be changed -->
+ <exclude>**/id_rsa**</exclude> <!--SSH-->
<!--special excludes-->
<exclude>.travis.yml</exclude>
<exclude>.github/PULL_REQUEST_TEMPLATE.md</exclude>