diff --git a/.travis.yml b/.travis.yml index 7529e7af0..874ef9046 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,14 @@ sudo: required dist: trusty matrix: include: - #- language: python - # python: 2.7 - # before_install: - # - cd pai-management - # install: - # - pip install paramiko pyyaml jinja2 python-etcd kubernetes - # script: - # - python -m unittest discover test/ + - language: python + python: 2.7 + before_install: + - cd deployment + install: + - pip install paramiko pyyaml jinja2 python-etcd kubernetes + script: + - python -m unittest discover test/ - language: python python: 2.7 before_install: diff --git a/pai-management/run_test.sh b/deployment/run_test.sh similarity index 100% rename from pai-management/run_test.sh rename to deployment/run_test.sh diff --git a/pai-management/test/__init__.py b/deployment/test/__init__.py similarity index 100% rename from pai-management/test/__init__.py rename to deployment/test/__init__.py diff --git a/pai-management/test/data/data_maintainlib_common/test.yaml b/deployment/test/data/data_maintainlib_common/test.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_common/test.yaml rename to deployment/test/data/data_maintainlib_common/test.yaml diff --git a/pai-management/test/data/data_maintainlib_common/test.yaml.template b/deployment/test/data/data_maintainlib_common/test.yaml.template similarity index 100% rename from pai-management/test/data/data_maintainlib_common/test.yaml.template rename to deployment/test/data/data_maintainlib_common/test.yaml.template diff --git a/pai-management/test/data/data_maintainlib_common/testfile1.sh.template b/deployment/test/data/data_maintainlib_common/testfile1.sh.template similarity index 100% rename from pai-management/test/data/data_maintainlib_common/testfile1.sh.template rename to deployment/test/data/data_maintainlib_common/testfile1.sh.template diff --git a/pai-management/test/data/data_maintainlib_common/testfile2.sh b/deployment/test/data/data_maintainlib_common/testfile2.sh similarity index 100% rename from pai-management/test/data/data_maintainlib_common/testfile2.sh rename to deployment/test/data/data_maintainlib_common/testfile2.sh diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_inconsistent_node_config.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_inconsistent_node_config.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_inconsistent_node_config.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_inconsistent_node_config.yaml diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_master_list.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_master_list.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_master_list.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_master_list.yaml diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_node_config.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_node_config.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_node_config.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_miss_node_config.yaml diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_ok.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_ok.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_ok.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_ok.yaml diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_wrong_node_config.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_wrong_node_config.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_cluster_config_wrong_node_config.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_cluster_config_wrong_node_config.yaml diff --git a/pai-management/test/data/data_maintainlib_etcdfix/test_node_list_config.yaml b/deployment/test/data/data_maintainlib_etcdfix/test_node_list_config.yaml similarity index 100% rename from pai-management/test/data/data_maintainlib_etcdfix/test_node_list_config.yaml rename to deployment/test/data/data_maintainlib_etcdfix/test_node_list_config.yaml diff --git a/pai-management/test/test-cluster-config.yaml b/deployment/test/test-cluster-config.yaml similarity index 100% rename from pai-management/test/test-cluster-config.yaml rename to deployment/test/test-cluster-config.yaml diff --git a/pai-management/test/test-maintain.yaml b/deployment/test/test-maintain.yaml similarity index 100% rename from pai-management/test/test-maintain.yaml rename to deployment/test/test-maintain.yaml diff --git a/pai-management/test/test_logging.yaml b/deployment/test/test_logging.yaml similarity index 100% rename from pai-management/test/test_logging.yaml rename to deployment/test/test_logging.yaml diff --git a/pai-management/test/test_maintainlib_common.py b/deployment/test/test_maintainlib_common.py similarity index 100% rename from pai-management/test/test_maintainlib_common.py rename to deployment/test/test_maintainlib_common.py diff --git a/pai-management/test/test_maintainlib_etcdfix.py b/deployment/test/test_maintainlib_etcdfix.py similarity index 100% rename from pai-management/test/test_maintainlib_etcdfix.py rename to deployment/test/test_maintainlib_etcdfix.py