aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2017-09-26 17:40:43 +0300
committerYuli Shlosberg <ys9693@att.com>2017-10-03 14:36:37 +0000
commit4e6552008b61d38cd48547b3c968ad653231d7a5 (patch)
treeba34dd84c7cd8fc5a532954da82d89aba3b9d4c8
parentef116017a530bb0b841662c4123016dbb0bcca6c (diff)
Add VNFs to sanity docker
Change-Id: I8b81db65fdbad997d8bdf680eed7dcde1b200eb4 Issue-Id: SDC-401 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit f8854eef352140497f0502e3f31bc839d173824b)
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zipbin0 -> 21937 bytes
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zipbin0 -> 3522 bytes
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zipbin0 -> 5621 bytes
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zipbin0 -> 944 bytes
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb2
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java30
6 files changed, 13 insertions, 19 deletions
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip
new file mode 100644
index 0000000000..bb91a948a6
--- /dev/null
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip
Binary files differ
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip
new file mode 100644
index 0000000000..b8273defea
--- /dev/null
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip
Binary files differ
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip
new file mode 100644
index 0000000000..19c8a7d599
--- /dev/null
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip
Binary files differ
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip
new file mode 100644
index 0000000000..dc9ef5d823
--- /dev/null
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip
Binary files differ
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
index 6f10a33dd6..690559a74d 100644
--- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
@@ -6,7 +6,7 @@ cwd "#{tests_base}"
code <<-EOH
cd "#{tests_base}"
jar_file=`ls test-apis*-jar-with-dependencies.jar`
- ./startTest.sh $jar_file #{ci_test_suite}
+ nohup ./startTest.sh $jar_file #{ci_test_suite} &
echo "return code from startTest.sh = [$?]"
EOH
timeout 72000
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
index ad1e8dd37d..1817b6e5cb 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
@@ -123,21 +123,20 @@ public abstract class ComponentBaseTest {
public void setBrowserBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception {
- String suiteName = ExtentManager.getSuiteName(context);
- ExtentTestManager.startTest(method.getName());
- ExtentTestManager.assignCategory(this.getClass());
-
-// boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
-// String className = method.getDeclaringClass().getName();
-// if (emptyDataProvider) {
-// System.out.println("ExtentReport instance started from BeforeMethod...");
-// String suiteName = ExtentManager.getSuiteName(context);
+// String suiteName = ExtentManager.getSuiteName(context);
// ExtentTestManager.startTest(method.getName());
// ExtentTestManager.assignCategory(this.getClass());
-//
-// } else {
-// System.out.println("ExtentReport instance started from Test...");
-// }
+
+ boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
+ String className = method.getDeclaringClass().getName();
+ if (!method.getName().equals("onboardVNFShotFlow")) {
+ System.out.println("ExtentReport instance started from BeforeMethod...");
+ ExtentTestManager.startTest(method.getName());
+ ExtentTestManager.assignCategory(this.getClass());
+
+ } else {
+ System.out.println("ExtentReport instance started from Test...");
+ }
}
@@ -176,13 +175,8 @@ public abstract class ComponentBaseTest {
@AfterClass(alwaysRun = true)
public synchronized static void cleanAfterClass() throws Exception{
-// System.out.println("<<<<<<<<class name>>>>>"+method.getDeclaringClass());
-// System.out.println("<<<<<<<<class name>>>>>"+method.getName());
-
-
System.out.println("delete components AfterClass");
deleteCreatedComponents(getCatalogAsMap());
-// extentReport.flush();
}