summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-06-20 15:22:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-20 15:22:59 +0000
commit7657b0e2cb4a8b1833b10bc6c91297981d376a5b (patch)
treee67350d0575907483a743ee225fea4a690fb2920
parent285a9db4548eba445c34933e6da6f22ef1af1b68 (diff)
parent26b89ecb973531dfcc0fd30bd50f083e585e1f4f (diff)
Merge "Rename folder for jenkins job"
-rw-r--r--test/csit/plans/dcaegen2/prh-testsuites/setup.sh (renamed from test/csit/plans/dcaegen2/prh_testsuites/setup.sh)2
-rw-r--r--test/csit/plans/dcaegen2/prh-testsuites/teardown.sh (renamed from test/csit/plans/dcaegen2/prh_testsuites/teardown.sh)0
-rw-r--r--test/csit/plans/dcaegen2/prh-testsuites/testplan.txt (renamed from test/csit/plans/dcaegen2/prh_testsuites/testplan.txt)2
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/__init__.robot (renamed from test/csit/tests/dcaegen2/prh_testcases/__init__.robot)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/prh_tests.robot (renamed from test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py)0
-rw-r--r--test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator (renamed from test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator)0
11 files changed, 2 insertions, 2 deletions
diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh
index 39c1fcef5..cdac9d210 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh
@@ -6,7 +6,7 @@ export PRH_SERVICE="prh"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
-cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/
+cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/
docker login -u docker -p docker nexus3.onap.org:10003
docker-compose up -d --build
diff --git a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh b/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh
index bd1e5ba06..bd1e5ba06 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/teardown.sh
+++ b/test/csit/plans/dcaegen2/prh-testsuites/teardown.sh
diff --git a/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt b/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt
index 8c1f3274a..9007a64b5 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/testplan.txt
+++ b/test/csit/plans/dcaegen2/prh-testsuites/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration.git]/test/csit/tests/.
# Place the suites in run order.
-dcaegen2/prh_testcases
+dcaegen2/prh-testcases
diff --git a/test/csit/tests/dcaegen2/prh_testcases/__init__.robot b/test/csit/tests/dcaegen2/prh-testcases/__init__.robot
index e69de29bb..e69de29bb 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/__init__.robot
+++ b/test/csit/tests/dcaegen2/prh-testcases/__init__.robot
diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot b/test/csit/tests/dcaegen2/prh-testcases/prh_tests.robot
index e507dcba7..e507dcba7 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot
+++ b/test/csit/tests/dcaegen2/prh-testcases/prh_tests.robot
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py b/test/csit/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
index f07f385f5..f07f385f5 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index e773b76a9..e773b76a9 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/docker-compose.yml
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index 2c0b42dcd..2c0b42dcd 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI.py
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator
index 2d96d8925..2d96d8925 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/AAI_simulator
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
index af716fd06..af716fd06 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP.py
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator
index 4de65393d..4de65393d 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/resources/simulator/DMaaP_simulator
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator