From: ilanap Date: Tue, 1 Jan 2019 15:22:07 +0000 (+0200) Subject: docker for cucumber BDD X-Git-Tag: 1.4.0~162 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=866418030975f2ee09a27d144de4e880218e84e8;p=sdc.git docker for cucumber BDD Issue-ID: SDC-2028 Change-Id: I7c1376c449ba7650c3bbc1838726cfd178d2ca40 Signed-off-by: ilanap --- diff --git a/openecomp-bdd/.gitignore b/cucumber-js-test-apis-ci/.gitignore similarity index 100% rename from openecomp-bdd/.gitignore rename to cucumber-js-test-apis-ci/.gitignore diff --git a/openecomp-bdd/README.txt b/cucumber-js-test-apis-ci/README.txt similarity index 100% rename from openecomp-bdd/README.txt rename to cucumber-js-test-apis-ci/README.txt diff --git a/openecomp-bdd/config.json b/cucumber-js-test-apis-ci/config.json similarity index 63% rename from openecomp-bdd/config.json rename to 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 similarity index 100% rename from openecomp-bdd/cucumber.js rename to cucumber-js-test-apis-ci/cucumber.js diff --git a/openecomp-bdd/pom.xml b/cucumber-js-test-apis-ci/dev_pom.xml similarity index 78% rename from openecomp-bdd/pom.xml rename to 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 @@ org.openecomp.sdc sdc-onboarding - 1.3.3-SNAPSHOT + 1.3.1-SNAPSHOT ../onboarding/pom.xml @@ -45,13 +45,6 @@ **/* - - ${basedir} - - jenkinsConfig.json - - - @@ -139,33 +132,6 @@ - - - maven-resources-plugin - 2.6 - - - copy-config - validate - - copy-resources - - - ${basedir} - - - ${basedir}/resources - - jenkinsConfig.json - - true - - - - - - - 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 similarity index 100% rename from openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/AbortFunctionality/TestProperties.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/AbortFunctionality/TestRollback.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/AbortFunctionality/TestSubmit.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/ActivitySpec/TestCreate.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/ActivitySpec/TestInvalidStatusTransition.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/ComponentData.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_Collaboration.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_HEAT.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_ResponseData_CheckAndManipulation.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_Rest_Calls.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_Toggle.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_ToscaTranslationFlow.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_VLM.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Example_VSP.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/GlobalTypes/TestInterfaceLifecycleTypes.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVlm.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/ArchiveItem/ArchiveVsp.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMCertified.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/DeleteItem/DeleteVLMDraft.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPCertified.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/DeleteItem/DeleteVSPDraft.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/ListItems/ListItemsFilters.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/ListItems/ListItemsFiltersFailures.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/Onboarding/UniqueValue.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/CapabilityDataType.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/HeatValidation.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/TOSCA/VlanTagging.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/UserFeedback/TestMD5.feature rename to 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 similarity index 100% rename from openecomp-bdd/features/UserFeedback/TestMRN.feature rename to cucumber-js-test-apis-ci/features/UserFeedback/TestMRN.feature diff --git a/openecomp-bdd/package.json b/cucumber-js-test-apis-ci/package.json similarity index 100% rename from openecomp-bdd/package.json rename to cucumber-js-test-apis-ci/package.json diff --git a/openecomp-bdd/plugins/README.md b/cucumber-js-test-apis-ci/plugins/README.md similarity index 100% rename from openecomp-bdd/plugins/README.md rename to 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 similarity index 100% rename from openecomp-bdd/plugins/jsdoc_config.json rename to 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 similarity index 100% rename from openecomp-bdd/plugins/reporter.js rename to 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 similarity index 100% rename from openecomp-bdd/plugins/steps.js rename to 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 @@ + + + 4.0.0 + + org.openecomp.sdc + sdc-main + 1.3.0-SNAPSHOT + + cucumber-bdd + cucumber-bdd + org.openecomp.sdc + 1.3.1-SNAPSHOT + jar + + + + maven-clean-plugin + 2.6.1 + + + clean.dist.folder + clean + + clean + + + + + ${basedir}/report + + **/* + + + + ${basedir}/resources/downloads + + **/* + + + + ${basedir}/docs + + **/* + + + + ${basedir} + + jenkinsConfig.json + + + + + + + + + maven-resources-plugin + 2.7 + + + + + + + ${basedir}/docker + ${project.build.directory}/docker_assembly + false + + + ${basedir} + + features/**/* + stepDefinitions/**/* + plugins/**/* + resources/**/* + *.js* + + ${project.build.directory}/docker_assembly/cucumber + false + + + + + + docker + + false + + + + + io.fabric8 + docker-maven-plugin + ${fabric8.version} + + true + 1.23 + nexus3.onap.org:10001 + + + docker + docker + + + + + + nfv/cucumber-sdc-api-tests + cucumber-sdc-api-tests + + try + ${project.build.directory}/docker_assembly + + ${docker.tag} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + + + + + + clean-images + pre-clean + + remove + + + true + nfv/cucumber-sdc-api-tests + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + nfv/cucumber-sdc-api-tests + + + + + + + + + diff --git a/openecomp-bdd/resources/json/createActivitySpec.json b/cucumber-js-test-apis-ci/resources/json/createActivitySpec.json similarity index 100% rename from openecomp-bdd/resources/json/createActivitySpec.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/createManualVSP.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/createVF.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/createVLM.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/createVSP.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/createOperation-with-workflow.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/createOperation.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/createService.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/createVF.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/json/operation/updateOperation.json rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/BASE_MUX.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/NEW_NC_with_manifest.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/all-violations.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/annotationMultVolume.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/errorHeat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/inputsForNestedHeat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/multiple-parents.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/nested-belongs-to-volume.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/refs_missing.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/tag_missing.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vMME_Ericsson_small_v2.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlan-tagging-positive.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1a/negativeNotBoundToParentPort.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1a/regularNestedSubinterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1a/subInterfaceGetAttrInOut.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffCompute_SubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffPort_SubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1b/diffSubInterfaceFile.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1b/regularNestedSubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1c1/multiplePortsMultipleVlans.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1c1/regularNestedSubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentNetwork.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern1c2/differentResourceGroupCount.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_MultiplePort_MultipleSubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern4/Pattern_4_SinglePort_SingleSubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern4/regularNestedSubInterface.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5ComplexVSPWithDiffSubInfConn.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/pattern5/Pattern_5_NestedResourceWithMultipleComputeAndPort.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1aHeat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1bHeat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c1Heat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern1c2Heat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/vlantagging/vfcinstancegroup/groupPattern4Heat.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/volumeUnderNested.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/uploads/zipWithExternalPort.zip rename to 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 similarity index 100% rename from openecomp-bdd/resources/yaml/CB_BASE.yaml rename to 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 similarity index 100% rename from openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/ActivitySpec_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/Collaboration_Steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/General_Steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/GlobalTypes.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/InputData_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/Item_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/NetworkPackage_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/Questionnaire_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/REST_Steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/Toggle_Steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/Utils.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/VF_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/VLM_steps.js rename to 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 similarity index 100% rename from openecomp-bdd/stepDefinitions/VSP_steps.js rename to 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 similarity index 98% rename from openecomp-bdd/stepDefinitions/world.js rename to 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 similarity index 100% rename from openecomp-bdd/yarn.lock rename to 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}" - } -}