120 files changed, 184 insertions, 58 deletions

diff --git a/openecomp-bdd/.gitignore b/cucumber-js-test-apis-ci/.gitignore
index 316e39847a..316e39847a 100644
--- a/openecomp-bdd/.gitignore
+++ b/cucumber-js-test-apis-ci/.gitignore
diff --git a/openecomp-bdd/README.txt b/cucumber-js-test-apis-ci/README.txt
index 35250ed375..35250ed375 100644
--- a/openecomp-bdd/README.txt
+++ b/cucumber-js-test-apis-ci/README.txt
diff --git a/openecomp-bdd/config.json b/cucumber-js-test-apis-ci/config.json
index 4bf5f95ac5..35c31272c1 100644
--- a/openecomp-bdd/config.json
+++ b/cucumber-js-test-apis-ci/config.json
@@ -2,27 +2,27 @@
   "protocol" : "http",
 
   "onboarding" : {
-    "port" : 8285,
+    "port" : "onboarding.port",
     "prefix" : "sdc1/feProxy/onboarding-api/v1.0",
     "server" : "onboarding.server",
-    "user" : "user"
+    "user" : "onboarding.user"
   },
   "vf" : {
-    "port" : 8285,
+    "port" : "vf.port",
     "prefix" : "sdc1/feProxy/rest/v1",
     "server" : "vf.server",
-    "user" : "user"
+    "user" : "vf.user"
   },
   "catalog" : {
-    "port" : 8080,
+    "port" : "CatalogBE.port",
     "prefix" : "sdc2/rest/v1",
     "server" : "CatalogBE.server",
-    "user" : "user"
+    "user" : "CatalogBE.user"
   },
   "activity_spec" : {
-    "port" : 8080,
+    "port" : "activity-spec.port",
     "prefix" : "activity-spec-api/v1.0",
     "server" : "activity_spec.server",
-    "user" : "user"
+    "user" : "activity-spec.user"
   }
 }
diff --git a/openecomp-bdd/cucumber.js b/cucumber-js-test-apis-ci/cucumber.js
index 4ade9b1cb3..4ade9b1cb3 100644
--- a/openecomp-bdd/cucumber.js
+++ b/cucumber-js-test-apis-ci/cucumber.js
diff --git a/openecomp-bdd/pom.xml b/cucumber-js-test-apis-ci/dev_pom.xml
index 91bf8ce8fd..7ad10f8d3f 100644
--- a/openecomp-bdd/pom.xml
+++ b/cucumber-js-test-apis-ci/dev_pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-onboarding</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../onboarding/pom.xml</relativePath>
     </parent>
 
@@ -45,13 +45,6 @@
                                   <include>**/*</include>
                                 </includes>
                               </fileset>
-                                <fileset>
-                                    <directory>${basedir}</directory>
-                                    <includes>
-                                        <include>jenkinsConfig.json</include>
-                                    </includes>
-                                </fileset>
-
                             </filesets>
                         </configuration>
                     </execution>
@@ -139,33 +132,6 @@
 
                 </executions>
             </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>copy-config</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/resources</directory>
-                                    <includes>
-                                        <include>jenkinsConfig.json</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 
diff --git a/cucumber-js-test-apis-ci/docker/Dockerfile b/cucumber-js-test-apis-ci/docker/Dockerfile
new file mode 100644
index 0000000000..8679bd5643
--- /dev/null
+++ b/cucumber-js-test-apis-ci/docker/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:6
+
+
+ENV TESTS_BASE /var/lib/tests
+USER root
+RUN mkdir $TESTS_BASE
+COPY cucumber $TESTS_BASE 
+COPY startup.sh $TESTS_BASE 
+RUN chmod 777 $TESTS_BASE/startup.sh
+
+ENTRYPOINT [ "/var/lib/tests/startup.sh" ]
diff --git a/cucumber-js-test-apis-ci/docker/startup.sh b/cucumber-js-test-apis-ci/docker/startup.sh
new file mode 100644
index 0000000000..f38acad8c7
--- /dev/null
+++ b/cucumber-js-test-apis-ci/docker/startup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd /var/lib/tests
+yarn install
+yarn run test-and-report
diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
new file mode 100644
index 0000000000..dc39627038
--- /dev/null
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -0,0 +1 @@
+docker run --volume /data/environments:/var/lib/tests/environments --volume /data/logs/cucumber:/var/lib/tests/report nfv/cucumber-sdc-api-tests:latest
diff --git a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
index 1c501d6599..1c501d6599 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
+++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
diff --git a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
index c3ee8a5e6c..c3ee8a5e6c 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
+++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
diff --git a/openecomp-bdd/features/AbortFunctionality/TestProperties.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestProperties.feature
index e9e9acdbe1..e9e9acdbe1 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestProperties.feature
+++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestProperties.feature
diff --git a/openecomp-bdd/features/AbortFunctionality/TestRollback.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestRollback.feature
index d61a1cc773..d61a1cc773 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestRollback.feature
+++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestRollback.feature
diff --git a/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature
index 3153022396..3153022396 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature
+++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature
diff --git a/openecomp-bdd/features/ActivitySpec/TestCreate.feature b/cucumber-js-test-apis-ci/features/ActivitySpec/TestCreate.feature
index c4e77a7c1b..c4e77a7c1b 100644
--- a/openecomp-bdd/features/ActivitySpec/TestCreate.feature
+++ b/cucumber-js-test-apis-ci/features/ActivitySpec/TestCreate.feature
diff --git a/openecomp-bdd/features/ActivitySpec/TestInvalidStatusTransition.feature b/cucumber-js-test-apis-ci/features/ActivitySpec/TestInvalidStatusTransition.feature
index 452570e421..452570e421 100644
--- a/openecomp-bdd/features/ActivitySpec/TestInvalidStatusTransition.feature
+++ b/cucumber-js-test-apis-ci/features/ActivitySpec/TestInvalidStatusTransition.feature
diff --git a/openecomp-bdd/features/ComponentData.feature b/cucumber-js-test-apis-ci/features/ComponentData.feature
index 62f09a357f..62f09a357f 100644
--- a/openecomp-bdd/features/ComponentData.feature
+++ b/cucumber-js-test-apis-ci/features/ComponentData.feature
diff --git a/openecomp-bdd/features/Example_Collaboration.feature b/cucumber-js-test-apis-ci/features/Example_Collaboration.feature
index c799efda12..c799efda12 100644
--- a/openecomp-bdd/features/Example_Collaboration.feature
+++ b/cucumber-js-test-apis-ci/features/Example_Collaboration.feature
diff --git a/openecomp-bdd/features/Example_HEAT.feature b/cucumber-js-test-apis-ci/features/Example_HEAT.feature
index 778fd96616..778fd96616 100644
--- a/openecomp-bdd/features/Example_HEAT.feature
+++ b/cucumber-js-test-apis-ci/features/Example_HEAT.feature
diff --git a/openecomp-bdd/features/Example_ResponseData_CheckAndManipulation.feature b/cucumber-js-test-apis-ci/features/Example_ResponseData_CheckAndManipulation.feature
index ffc74f19bb..ffc74f19bb 100644
--- a/openecomp-bdd/features/Example_ResponseData_CheckAndManipulation.feature
+++ b/cucumber-js-test-apis-ci/features/Example_ResponseData_CheckAndManipulation.feature
diff --git a/openecomp-bdd/features/Example_Rest_Calls.feature b/cucumber-js-test-apis-ci/features/Example_Rest_Calls.feature
index e650fede66..e650fede66 100644
--- a/openecomp-bdd/features/Example_Rest_Calls.feature
+++ b/cucumber-js-test-apis-ci/features/Example_Rest_Calls.feature
diff --git a/openecomp-bdd/features/Example_Toggle.feature b/cucumber-js-test-apis-ci/features/Example_Toggle.feature
index 2d930773bd..2d930773bd 100644
--- a/openecomp-bdd/features/Example_Toggle.feature
+++ b/cucumber-js-test-apis-ci/features/Example_Toggle.feature
diff --git a/openecomp-bdd/features/Example_ToscaTranslationFlow.feature b/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature
index 5ec35f9a45..5ec35f9a45 100644
--- a/openecomp-bdd/features/Example_ToscaTranslationFlow.feature
+++ b/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature
diff --git a/openecomp-bdd/features/Example_VLM.feature b/cucumber-js-test-apis-ci/features/Example_VLM.feature
index f4093ff07e..f4093ff07e 100644
--- a/openecomp-bdd/features/Example_VLM.feature
+++ b/cucumber-js-test-apis-ci/features/Example_VLM.feature
diff --git a/openecomp-bdd/features/Example_VSP.feature b/cucumber-js-test-apis-ci/features/Example_VSP.feature
index 5cffa585c5..5cffa585c5 100644
--- a/openecomp-bdd/features/Example_VSP.feature
+++ b/cucumber-js-test-apis-ci/features/Example_VSP.feature
diff --git a/openecomp-bdd/features/GlobalTypes/TestInterfaceLifecycleTypes.feature b/cucumber-js-test-apis-ci/features/GlobalTypes/TestInterfaceLifecycleTypes.feature
index ef98fa5b42..ef98fa5b42 100644
--- a/openecomp-bdd/features/GlobalTypes/TestInterfaceLifecycleTypes.feature
+++ b/cucumber-js-test-apis-ci/features/GlobalTypes/TestInterfaceLifecycleTypes.feature
diff --git a/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature b/cucumber-js-test-apis-ci/features/InterfaceOperation/TestResourceInterfaceOperation.feature
index ed09f2fb20..ed09f2fb20 100644
--- a/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature
+++ b/cucumber-js-test-apis-ci/features/InterfaceOperation/TestResourceInterfaceOperation.feature
diff --git a/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature b/cucumber-js-test-apis-ci/features/InterfaceOperation/TestServiceInterfaceOperation.feature
index 1ff0ba3f1b..1ff0ba3f1b 100644
--- a/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature
+++ b/cucumber-js-test-apis-ci/features/InterfaceOperation/TestServiceInterfaceOperation.feature
diff --git a/openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVlm.feature b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVlm.feature
index f4b524b372..f4b524b372 100644
--- a/openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVlm.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVlm.feature
diff --git a/openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVsp.feature b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature
index 2cc057469f..2cc057469f 100644
--- a/openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVsp.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature
diff --git a/openecomp-bdd/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature
index f68eece6a8..f68eece6a8 100644
--- a/openecomp-bdd/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature
diff --git a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMCertified.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVLMCertified.feature
index 4eb31aeafe..4eb31aeafe 100644
--- a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMCertified.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVLMCertified.feature
diff --git a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMDraft.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVLMDraft.feature
index ad8bec50d3..ad8bec50d3 100644
--- a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMDraft.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVLMDraft.feature
diff --git a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPCertified.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature
index 35a506a010..35a506a010 100644
--- a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPCertified.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature
diff --git a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPDraft.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature
index 5248131618..5248131618 100644
--- a/openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPDraft.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature
diff --git a/openecomp-bdd/features/Onboarding/ListItems/ListItemsFilters.feature b/cucumber-js-test-apis-ci/features/Onboarding/ListItems/ListItemsFilters.feature
index 8b0a23213d..8b0a23213d 100644
--- a/openecomp-bdd/features/Onboarding/ListItems/ListItemsFilters.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/ListItems/ListItemsFilters.feature
diff --git a/openecomp-bdd/features/Onboarding/ListItems/ListItemsFiltersFailures.feature b/cucumber-js-test-apis-ci/features/Onboarding/ListItems/ListItemsFiltersFailures.feature
index 53807af47a..53807af47a 100644
--- a/openecomp-bdd/features/Onboarding/ListItems/ListItemsFiltersFailures.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/ListItems/ListItemsFiltersFailures.feature
diff --git a/openecomp-bdd/features/Onboarding/UniqueValue.feature b/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature
index 31e41b9931..31e41b9931 100644
--- a/openecomp-bdd/features/Onboarding/UniqueValue.feature
+++ b/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature
diff --git a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature b/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature
index ef240e33a3..ef240e33a3 100644
--- a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature
diff --git a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature b/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature
index ae0803687f..ae0803687f 100644
--- a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature
diff --git a/openecomp-bdd/features/TOSCA/HeatValidation.feature b/cucumber-js-test-apis-ci/features/TOSCA/HeatValidation.feature
index dba54ff9ff..dba54ff9ff 100644
--- a/openecomp-bdd/features/TOSCA/HeatValidation.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/HeatValidation.feature
diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature
index 280ec8b791..280ec8b791 100644
--- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature
diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature
index b0e5b4494a..b0e5b4494a 100644
--- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature
diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature
index 3cf52f6527..3cf52f6527 100644
--- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature
diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature
index 0b9e092875..0b9e092875 100644
--- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature
diff --git a/openecomp-bdd/features/TOSCA/VlanTagging.feature b/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature
index 7adf99fae2..7adf99fae2 100644
--- a/openecomp-bdd/features/TOSCA/VlanTagging.feature
+++ b/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature
diff --git a/openecomp-bdd/features/UserFeedback/TestMD5.feature b/cucumber-js-test-apis-ci/features/UserFeedback/TestMD5.feature
index bb80c92d06..bb80c92d06 100644
--- a/openecomp-bdd/features/UserFeedback/TestMD5.feature
+++ b/cucumber-js-test-apis-ci/features/UserFeedback/TestMD5.feature
diff --git a/openecomp-bdd/features/UserFeedback/TestMRN.feature b/cucumber-js-test-apis-ci/features/UserFeedback/TestMRN.feature
index 161ea57341..161ea57341 100644
--- a/openecomp-bdd/features/UserFeedback/TestMRN.feature
+++ b/cucumber-js-test-apis-ci/features/UserFeedback/TestMRN.feature
diff --git a/openecomp-bdd/package.json b/cucumber-js-test-apis-ci/package.json
index 0aecbdc4fd..0aecbdc4fd 100644
--- a/openecomp-bdd/package.json
+++ b/cucumber-js-test-apis-ci/package.json
diff --git a/openecomp-bdd/plugins/README.md b/cucumber-js-test-apis-ci/plugins/README.md
index 956fe77276..956fe77276 100644
--- a/openecomp-bdd/plugins/README.md
+++ b/cucumber-js-test-apis-ci/plugins/README.md
diff --git a/openecomp-bdd/plugins/jsdoc_config.json b/cucumber-js-test-apis-ci/plugins/jsdoc_config.json
index a5a608e805..a5a608e805 100644
--- a/openecomp-bdd/plugins/jsdoc_config.json
+++ b/cucumber-js-test-apis-ci/plugins/jsdoc_config.json
diff --git a/openecomp-bdd/plugins/reporter.js b/cucumber-js-test-apis-ci/plugins/reporter.js
index 8913789c95..8913789c95 100644
--- a/openecomp-bdd/plugins/reporter.js
+++ b/cucumber-js-test-apis-ci/plugins/reporter.js
diff --git a/openecomp-bdd/plugins/steps.js b/cucumber-js-test-apis-ci/plugins/steps.js
index 2faa7efbd8..2faa7efbd8 100644
--- a/openecomp-bdd/plugins/steps.js
+++ b/cucumber-js-test-apis-ci/plugins/steps.js
diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
new file mode 100644
index 0000000000..d3dda714e7
--- /dev/null
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.openecomp.sdc</groupId>
+    <artifactId>sdc-main</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>cucumber-bdd</artifactId>
+  <name>cucumber-bdd</name>
+  <groupId>org.openecomp.sdc</groupId>
+  <version>1.3.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.6.1</version>
+        <executions>
+          <execution>
+            <id>clean.dist.folder</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>${basedir}/report</directory>
+                  <includes>
+                    <include>**/*</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}/resources/downloads</directory>
+                  <includes>
+                    <include>**/*</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}/docs</directory>
+                  <includes>
+                    <include>**/*</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>${basedir}</directory>
+                  <includes>
+                    <include>jenkinsConfig.json</include>
+                  </includes>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+        <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.7</version>
+            <configuration>   
+            </configuration>
+        </plugin>
+    </plugins>
+    <resources>
+        <resource>
+            <directory>${basedir}/docker</directory>
+            <targetPath>${project.build.directory}/docker_assembly</targetPath>
+            <filtering>false</filtering>
+        </resource>
+        <resource>
+            <directory>${basedir}</directory>
+		<includes>
+			<include>features/**/*</include>
+			<include>stepDefinitions/**/*</include>
+			<include>plugins/**/*</include>
+			<include>resources/**/*</include>
+			<include>*.js*</include>
+		</includes>
+            <targetPath>${project.build.directory}/docker_assembly/cucumber</targetPath>
+            <filtering>false</filtering>
+        </resource>
+    </resources>  
+  </build>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.fabric8</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>${fabric8.version}</version>
+            <configuration>
+              <verbose>true</verbose>
+              <apiVersion>1.23</apiVersion>
+              <registry>nexus3.onap.org:10001</registry>
+              <authConfig>
+                <pull>
+                  <username>docker</username>
+                  <password>docker</password>
+                </pull>
+              </authConfig>
+              <images>
+                <!-- Build sanity image -->
+                <image>
+                  <name>nfv/cucumber-sdc-api-tests</name>
+                  <alias>cucumber-sdc-api-tests</alias>
+                  <build>
+                    <cleanup>try</cleanup>
+                    <dockerFileDir>${project.build.directory}/docker_assembly</dockerFileDir>
+                    <tags>
+                      <tag>${docker.tag}</tag>
+                      <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                    </tags>
+                  </build>
+                </image>
+              </images>
+            </configuration>
+            <executions>
+              <execution>
+                <id>clean-images</id>
+                <phase>pre-clean</phase>
+                <goals>
+                  <goal>remove</goal>
+                </goals>
+                <configuration>
+                  <removeAll>true</removeAll>
+                  <image>nfv/cucumber-sdc-api-tests</image>
+                </configuration>
+              </execution>
+              <execution>
+                <id>generate-images</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>push-images</id>
+                <phase>deploy</phase>
+                <goals>
+                  <goal>push</goal>
+                </goals>
+                <configuration>
+                  <image>nfv/cucumber-sdc-api-tests</image>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/openecomp-bdd/resources/json/createActivitySpec.json b/cucumber-js-test-apis-ci/resources/json/createActivitySpec.json
index 29ad716834..29ad716834 100644
--- a/openecomp-bdd/resources/json/createActivitySpec.json
+++ b/cucumber-js-test-apis-ci/resources/json/createActivitySpec.json
diff --git a/openecomp-bdd/resources/json/createManualVSP.json b/cucumber-js-test-apis-ci/resources/json/createManualVSP.json
index 9ce14f545d..9ce14f545d 100644
--- a/openecomp-bdd/resources/json/createManualVSP.json
+++ b/cucumber-js-test-apis-ci/resources/json/createManualVSP.json
diff --git a/openecomp-bdd/resources/json/createVF.json b/cucumber-js-test-apis-ci/resources/json/createVF.json
index 2ddd0f5c09..2ddd0f5c09 100644
--- a/openecomp-bdd/resources/json/createVF.json
+++ b/cucumber-js-test-apis-ci/resources/json/createVF.json
diff --git a/openecomp-bdd/resources/json/createVLM.json b/cucumber-js-test-apis-ci/resources/json/createVLM.json
index 9431c070e6..9431c070e6 100644
--- a/openecomp-bdd/resources/json/createVLM.json
+++ b/cucumber-js-test-apis-ci/resources/json/createVLM.json
diff --git a/openecomp-bdd/resources/json/createVSP.json b/cucumber-js-test-apis-ci/resources/json/createVSP.json
index 6f63261beb..6f63261beb 100644
--- a/openecomp-bdd/resources/json/createVSP.json
+++ b/cucumber-js-test-apis-ci/resources/json/createVSP.json
diff --git a/openecomp-bdd/resources/json/operation/createOperation-with-workflow.json b/cucumber-js-test-apis-ci/resources/json/operation/createOperation-with-workflow.json
index e9693adf2a..e9693adf2a 100644
--- a/openecomp-bdd/resources/json/operation/createOperation-with-workflow.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/createOperation-with-workflow.json
diff --git a/openecomp-bdd/resources/json/operation/createOperation.json b/cucumber-js-test-apis-ci/resources/json/operation/createOperation.json
index 10c34ba8f2..10c34ba8f2 100644
--- a/openecomp-bdd/resources/json/operation/createOperation.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/createOperation.json
diff --git a/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json b/cucumber-js-test-apis-ci/resources/json/operation/createOperationWithInputOutput.json
index 013d615999..013d615999 100644
--- a/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/createOperationWithInputOutput.json
diff --git a/openecomp-bdd/resources/json/operation/createService.json b/cucumber-js-test-apis-ci/resources/json/operation/createService.json
index e7afe2aa21..e7afe2aa21 100644
--- a/openecomp-bdd/resources/json/operation/createService.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/createService.json
diff --git a/openecomp-bdd/resources/json/operation/createVF.json b/cucumber-js-test-apis-ci/resources/json/operation/createVF.json
index 6fe9688caa..6fe9688caa 100644
--- a/openecomp-bdd/resources/json/operation/createVF.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/createVF.json
diff --git a/openecomp-bdd/resources/json/operation/updateOperation.json b/cucumber-js-test-apis-ci/resources/json/operation/updateOperation.json
index 698d38c612..698d38c612 100644
--- a/openecomp-bdd/resources/json/operation/updateOperation.json
+++ b/cucumber-js-test-apis-ci/resources/json/operation/updateOperation.json
diff --git a/openecomp-bdd/resources/uploads/BASE_MUX.zip b/cucumber-js-test-apis-ci/resources/uploads/BASE_MUX.zip
index 4e7fbcf31d..4e7fbcf31d 100644
--- a/openecomp-bdd/resources/uploads/BASE_MUX.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/BASE_MUX.zip
diff --git a/openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip b/cucumber-js-test-apis-ci/resources/uploads/BASE_MUX_with_no_base.zip
index 8698ef7e4c..8698ef7e4c 100644
--- a/openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/BASE_MUX_with_no_base.zip
diff --git a/openecomp-bdd/resources/uploads/NEW_NC_with_manifest.zip b/cucumber-js-test-apis-ci/resources/uploads/NEW_NC_with_manifest.zip
index 403cb7be1f..403cb7be1f 100644
--- a/openecomp-bdd/resources/uploads/NEW_NC_with_manifest.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/NEW_NC_with_manifest.zip
diff --git a/openecomp-bdd/resources/uploads/all-violations.zip b/cucumber-js-test-apis-ci/resources/uploads/all-violations.zip
index d86c7a7ee3..d86c7a7ee3 100644
--- a/openecomp-bdd/resources/uploads/all-violations.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/all-violations.zip
diff --git a/openecomp-bdd/resources/uploads/annotationMultVolume.zip b/cucumber-js-test-apis-ci/resources/uploads/annotationMultVolume.zip
index 8dc3f7863d..8dc3f7863d 100644
--- a/openecomp-bdd/resources/uploads/annotationMultVolume.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/annotationMultVolume.zip
diff --git a/openecomp-bdd/resources/uploads/errorHeat.zip b/cucumber-js-test-apis-ci/resources/uploads/errorHeat.zip
index 21444fadb7..21444fadb7 100644
--- a/openecomp-bdd/resources/uploads/errorHeat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/errorHeat.zip
diff --git a/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip b/cucumber-js-test-apis-ci/resources/uploads/inputsForNestedHeat.zip
index f1569ee4a4..f1569ee4a4 100644
--- a/openecomp-bdd/resources/uploads/inputsForNestedHeat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/inputsForNestedHeat.zip
diff --git a/openecomp-bdd/resources/uploads/multiple-parents.zip b/cucumber-js-test-apis-ci/resources/uploads/multiple-parents.zip
index 64d579ca2e..64d579ca2e 100644
--- a/openecomp-bdd/resources/uploads/multiple-parents.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/multiple-parents.zip
diff --git a/openecomp-bdd/resources/uploads/nested-belongs-to-volume.zip b/cucumber-js-test-apis-ci/resources/uploads/nested-belongs-to-volume.zip
index 690cb954e2..690cb954e2 100644
--- a/openecomp-bdd/resources/uploads/nested-belongs-to-volume.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/nested-belongs-to-volume.zip
diff --git a/openecomp-bdd/resources/uploads/refs_missing.zip b/cucumber-js-test-apis-ci/resources/uploads/refs_missing.zip
index 3aec1382fc..3aec1382fc 100644
--- a/openecomp-bdd/resources/uploads/refs_missing.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/refs_missing.zip
diff --git a/openecomp-bdd/resources/uploads/tag_missing.zip b/cucumber-js-test-apis-ci/resources/uploads/tag_missing.zip
index 84b0d8ef3e..84b0d8ef3e 100644
--- a/openecomp-bdd/resources/uploads/tag_missing.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/tag_missing.zip
diff --git a/openecomp-bdd/resources/uploads/vMME_Ericsson_small_v2.zip b/cucumber-js-test-apis-ci/resources/uploads/vMME_Ericsson_small_v2.zip
index f5b1375b03..f5b1375b03 100644
--- a/openecomp-bdd/resources/uploads/vMME_Ericsson_small_v2.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vMME_Ericsson_small_v2.zip
diff --git a/openecomp-bdd/resources/uploads/vlan-tagging-positive.zip b/cucumber-js-test-apis-ci/resources/uploads/vlan-tagging-positive.zip
index b4519778c4..b4519778c4 100644
--- a/openecomp-bdd/resources/uploads/vlan-tagging-positive.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlan-tagging-positive.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/negativeNotBoundToParentPort.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/negativeNotBoundToParentPort.zip
index 129fc7ebd1..129fc7ebd1 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/negativeNotBoundToParentPort.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/negativeNotBoundToParentPort.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/regularNestedSubinterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/regularNestedSubinterface.zip
index a64f081699..a64f081699 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/regularNestedSubinterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/regularNestedSubinterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/subInterfaceGetAttrInOut.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/subInterfaceGetAttrInOut.zip
index 993e9f8e03..993e9f8e03 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1a/subInterfaceGetAttrInOut.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1a/subInterfaceGetAttrInOut.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffCompute_SubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffCompute_SubInterface.zip
index c0b54c49cd..c0b54c49cd 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffCompute_SubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffCompute_SubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffPort_SubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffPort_SubInterface.zip
index 713e429da6..713e429da6 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffPort_SubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffPort_SubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffSubInterfaceFile.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffSubInterfaceFile.zip
index 24da28acab..24da28acab 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffSubInterfaceFile.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/diffSubInterfaceFile.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/regularNestedSubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/regularNestedSubInterface.zip
index f967bf9e40..f967bf9e40 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1b/regularNestedSubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1b/regularNestedSubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1c1/multiplePortsMultipleVlans.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c1/multiplePortsMultipleVlans.zip
index 7c6890e76e..7c6890e76e 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1c1/multiplePortsMultipleVlans.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c1/multiplePortsMultipleVlans.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1c1/regularNestedSubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c1/regularNestedSubInterface.zip
index 57e270b790..57e270b790 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1c1/regularNestedSubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c1/regularNestedSubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentNetwork.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c2/differentNetwork.zip
index 87d724bf88..87d724bf88 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentNetwork.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c2/differentNetwork.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentResourceGroupCount.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c2/differentResourceGroupCount.zip
index 13c08e99c4..13c08e99c4 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentResourceGroupCount.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern1c2/differentResourceGroupCount.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_MultiplePort_MultipleSubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/Pattern_4_MultiplePort_MultipleSubInterface.zip
index fb4c68d03e..fb4c68d03e 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_MultiplePort_MultipleSubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/Pattern_4_MultiplePort_MultipleSubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_SinglePort_SingleSubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/Pattern_4_SinglePort_SingleSubInterface.zip
index 87c44899d5..87c44899d5 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_SinglePort_SingleSubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/Pattern_4_SinglePort_SingleSubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern4/regularNestedSubInterface.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/regularNestedSubInterface.zip
index 89adb0f9ec..89adb0f9ec 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern4/regularNestedSubInterface.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern4/regularNestedSubInterface.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5ComplexVSPWithDiffSubInfConn.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern5/Pattern_5ComplexVSPWithDiffSubInfConn.zip
index f42824098c..f42824098c 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5ComplexVSPWithDiffSubInfConn.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern5/Pattern_5ComplexVSPWithDiffSubInfConn.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5_NestedResourceWithMultipleComputeAndPort.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern5/Pattern_5_NestedResourceWithMultipleComputeAndPort.zip
index 64430235bf..64430235bf 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5_NestedResourceWithMultipleComputeAndPort.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/pattern5/Pattern_5_NestedResourceWithMultipleComputeAndPort.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1aHeat.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1aHeat.zip
index f4107be42a..f4107be42a 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1aHeat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1aHeat.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1bHeat.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1bHeat.zip
index d4244b684a..d4244b684a 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1bHeat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1bHeat.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c1Heat.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c1Heat.zip
index 2ac16049bd..2ac16049bd 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c1Heat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c1Heat.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c2Heat.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c2Heat.zip
index 7d990e6844..7d990e6844 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c2Heat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c2Heat.zip
diff --git a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern4Heat.zip b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern4Heat.zip
index e744c93a6b..e744c93a6b 100644
--- a/openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern4Heat.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/vlantagging/vfcinstancegroup/groupPattern4Heat.zip
diff --git a/openecomp-bdd/resources/uploads/volumeUnderNested.zip b/cucumber-js-test-apis-ci/resources/uploads/volumeUnderNested.zip
index 01798a5723..01798a5723 100644
--- a/openecomp-bdd/resources/uploads/volumeUnderNested.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/volumeUnderNested.zip
diff --git a/openecomp-bdd/resources/uploads/zipWithExternalPort.zip b/cucumber-js-test-apis-ci/resources/uploads/zipWithExternalPort.zip
index 3d6b3d09b4..3d6b3d09b4 100644
--- a/openecomp-bdd/resources/uploads/zipWithExternalPort.zip
+++ b/cucumber-js-test-apis-ci/resources/uploads/zipWithExternalPort.zip
diff --git a/openecomp-bdd/resources/yaml/CB_BASE.yaml b/cucumber-js-test-apis-ci/resources/yaml/CB_BASE.yaml
index 4aef40b270..4aef40b270 100644
--- a/openecomp-bdd/resources/yaml/CB_BASE.yaml
+++ b/cucumber-js-test-apis-ci/resources/yaml/CB_BASE.yaml
diff --git a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml b/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml
index fb301b6ab6..fb301b6ab6 100644
--- a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml
+++ b/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml
diff --git a/openecomp-bdd/stepDefinitions/ActivitySpec_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/ActivitySpec_steps.js
index 7fe8ddf201..7fe8ddf201 100644
--- a/openecomp-bdd/stepDefinitions/ActivitySpec_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/ActivitySpec_steps.js
diff --git a/openecomp-bdd/stepDefinitions/Collaboration_Steps.js b/cucumber-js-test-apis-ci/stepDefinitions/Collaboration_Steps.js
index c4de758300..c4de758300 100644
--- a/openecomp-bdd/stepDefinitions/Collaboration_Steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/Collaboration_Steps.js
diff --git a/openecomp-bdd/stepDefinitions/General_Steps.js b/cucumber-js-test-apis-ci/stepDefinitions/General_Steps.js
index 2076366595..2076366595 100644
--- a/openecomp-bdd/stepDefinitions/General_Steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/General_Steps.js
diff --git a/openecomp-bdd/stepDefinitions/GlobalTypes.js b/cucumber-js-test-apis-ci/stepDefinitions/GlobalTypes.js
index 461fee74a7..461fee74a7 100644
--- a/openecomp-bdd/stepDefinitions/GlobalTypes.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/GlobalTypes.js
diff --git a/openecomp-bdd/stepDefinitions/InputData_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/InputData_steps.js
index 57a374b9bb..57a374b9bb 100644
--- a/openecomp-bdd/stepDefinitions/InputData_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/InputData_steps.js
diff --git a/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js b/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js
index 408db9e9f8..408db9e9f8 100644
--- a/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js
diff --git a/openecomp-bdd/stepDefinitions/Item_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/Item_steps.js
index 3ff7f20f73..3ff7f20f73 100644
--- a/openecomp-bdd/stepDefinitions/Item_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/Item_steps.js
diff --git a/openecomp-bdd/stepDefinitions/NetworkPackage_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/NetworkPackage_steps.js
index 731d5b8470..731d5b8470 100644
--- a/openecomp-bdd/stepDefinitions/NetworkPackage_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/NetworkPackage_steps.js
diff --git a/openecomp-bdd/stepDefinitions/Questionnaire_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/Questionnaire_steps.js
index 2e169fadc8..2e169fadc8 100644
--- a/openecomp-bdd/stepDefinitions/Questionnaire_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/Questionnaire_steps.js
diff --git a/openecomp-bdd/stepDefinitions/REST_Steps.js b/cucumber-js-test-apis-ci/stepDefinitions/REST_Steps.js
index c3844124d7..c3844124d7 100644
--- a/openecomp-bdd/stepDefinitions/REST_Steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/REST_Steps.js
diff --git a/openecomp-bdd/stepDefinitions/Toggle_Steps.js b/cucumber-js-test-apis-ci/stepDefinitions/Toggle_Steps.js
index 16bcc2afb9..16bcc2afb9 100644
--- a/openecomp-bdd/stepDefinitions/Toggle_Steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/Toggle_Steps.js
diff --git a/openecomp-bdd/stepDefinitions/Utils.js b/cucumber-js-test-apis-ci/stepDefinitions/Utils.js
index 66e959f6e5..66e959f6e5 100644
--- a/openecomp-bdd/stepDefinitions/Utils.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/Utils.js
diff --git a/openecomp-bdd/stepDefinitions/VF_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js
index 3411a25fcb..3411a25fcb 100644
--- a/openecomp-bdd/stepDefinitions/VF_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js
diff --git a/openecomp-bdd/stepDefinitions/VLM_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/VLM_steps.js
index 35e78b2d97..35e78b2d97 100644
--- a/openecomp-bdd/stepDefinitions/VLM_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/VLM_steps.js
diff --git a/openecomp-bdd/stepDefinitions/VSP_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/VSP_steps.js
index b9b928a7f6..b9b928a7f6 100644
--- a/openecomp-bdd/stepDefinitions/VSP_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/VSP_steps.js
diff --git a/openecomp-bdd/stepDefinitions/world.js b/cucumber-js-test-apis-ci/stepDefinitions/world.js
index 0ffcc8e39c..eaf48aa31f 100644
--- a/openecomp-bdd/stepDefinitions/world.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/world.js
@@ -22,7 +22,7 @@ try {
 	localConfig = require('../devConfig.json');
 } catch (e) {
 	try {
-		localConfig = require('../jenkinsConfig.json');
+		localConfig = require('../environments/dockerConfig.json');
 	} catch (e) {
 		console.error("no env configuration was found!");
 	}
diff --git a/openecomp-bdd/yarn.lock b/cucumber-js-test-apis-ci/yarn.lock
index 6324af4df8..6324af4df8 100644
--- a/openecomp-bdd/yarn.lock
+++ b/cucumber-js-test-apis-ci/yarn.lock
diff --git a/openecomp-bdd/resources/jenkinsConfig.json b/openecomp-bdd/resources/jenkinsConfig.json
deleted file mode 100644
index 02ae0daa87..0000000000
--- a/openecomp-bdd/resources/jenkinsConfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "onboarding" : {
-    "user": "${onboardingUser}",
-    "server": "${onboardingServer}"
-  },
-  "vf" : {
-    "user": "${vfUser}",
-    "server": "${vfServer}"
-  },
-  "activity_spec" : {
-    "user": "${activitySpecUser}",
-    "server": "${activitySpecServer}"
-  }
-}