From 787cfd5756e784be88874ef31783584e0ffd5d0c Mon Sep 17 00:00:00 2001 From: vasraz Date: Tue, 23 Mar 2021 17:47:51 +0000 Subject: Skip swagger in fast build profile Add configuration to skip swagger in 'fast-build' profile Change-Id: I737e3df89d0b15391616ccbce9da4b3ecdd7ed67 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3525 --- catalog-be/pom.xml | 51 +- cucumber-js-test-apis-ci/pom.xml | 562 +++++++++++---------- integration-tests/pom.xml | 84 ++- onboarding/pom.xml | 4 +- .../onboarding-rest-war/pom.xml | 24 +- openecomp-be/tools/swagger-ui/pom.xml | 19 +- openecomp-be/tools/zusammen-tools/pom.xml | 11 +- pom.xml | 41 +- 8 files changed, 439 insertions(+), 357 deletions(-) diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index c7fb4355f6..00cbc8b51f 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -1,6 +1,6 @@ + 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"> 4.0.0 catalog-be @@ -14,7 +14,7 @@ 2.0.0.0 - 2.1.1 + ${swagger-core-mvn-plugin.version} 3.25.0 3.1.1 1.5.3 @@ -945,7 +945,9 @@ src/test/resources/**/*.y*ml - src/test/resources/artifacts/pnfSoftwareInformation/** + + src/test/resources/artifacts/pnfSoftwareInformation/** + @@ -1017,7 +1019,8 @@ - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + + sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default false @@ -1032,6 +1035,7 @@ io.swagger.core.v3 swagger-maven-plugin + ${swagger-core-mvn-plugin.version} sdce-2-sdce-5 @@ -1044,7 +1048,10 @@ ${project.build.directory}/generated/swagger swagger-sdce-2-sdce-5 JSON - ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml + + ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml + + ${swagger.skip} @@ -1058,7 +1065,10 @@ ${project.build.directory}/generated/swagger swagger-sdce-4 JSON - ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml + + ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml + + ${swagger.skip} @@ -1072,7 +1082,10 @@ ${project.build.directory}/generated/swagger swagger-sdce-6 JSON - ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml + + ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml + + ${swagger.skip} @@ -1086,7 +1099,10 @@ ${project.build.directory}/generated/swagger swagger-sdce-7 JSON - ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml + + ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml + + ${swagger.skip} @@ -1162,7 +1178,8 @@ - ${project.parent.basedir}/catalog-be/target + ${project.parent.basedir}/catalog-be/target + normatives.tar.gz @@ -1182,7 +1199,8 @@ - ${project.parent.basedir}/catalog-be/src/main/resources/ + + ${project.parent.basedir}/catalog-be/src/main/resources/ scripts/sdcBePy/** @@ -1220,7 +1238,9 @@ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + backend/backend-files.xml @@ -1234,13 +1254,16 @@ sdc-backend-init try - ${project.basedir}/sdc-backend-init + ${project.basedir}/sdc-backend-init + latest ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml index 68165528cf..a24c1cb0da 100644 --- a/cucumber-js-test-apis-ci/pom.xml +++ b/cucumber-js-test-apis-ci/pom.xml @@ -1,290 +1,298 @@ - 4.0.0 - - org.openecomp.sdc - sdc-main + 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"> + 4.0.0 + + org.openecomp.sdc + sdc-main + 1.7.0-SNAPSHOT + + cucumber-bdd + cucumber-bdd 1.7.0-SNAPSHOT - - cucumber-bdd - cucumber-bdd - 1.7.0-SNAPSHOT - jar - - - - maven-clean-plugin - 2.6.1 - - - clean.dist.folder - clean - - clean - - - - - ${basedir}/node_modules - - **/* - - - - ${basedir}/report - - **/* - - - - ${basedir}/resources/downloads - - **/* - - - - ${basedir}/docs - - **/* - - - - ${basedir} - - jenkinsConfig.json - - - - - - - - - maven-resources-plugin - 2.7 - - - - - com.github.eirslett - frontend-maven-plugin - - - ${project.parent.parent.basedir} - - - - - install node and npm - - install-node-and-npm - - generate-resources - - v10.17.0 - 6.11.3 - - - - npm run install - - npm - - - install - - - - - - - - ${basedir}/docker - ${project.build.directory}/docker_assembly - false - - - - - - dev - - false - - + jar + - - maven-antrun-plugin - - - create-reporting-folders - initialize + + maven-clean-plugin + 2.6.1 + + + clean.dist.folder + clean + + clean + + + + + ${basedir}/node_modules + + **/* + + + + ${basedir}/report + + **/* + + + + ${basedir}/resources/downloads + + **/* + + + + ${basedir}/docs + + **/* + + + + ${basedir} + + jenkinsConfig.json + + + + + + + + + maven-resources-plugin + 2.7 - - - - - - - - - - com.github.eirslett - frontend-maven-plugin - - - ${project.basedir} - ${project.parent.parent.basedir} - + + + com.github.eirslett + frontend-maven-plugin - - - - npm run install - - npm - - install + ${project.parent.parent.basedir} - - - npm run cucumber test - - npm - - - false - run test-and-report - - test - + + + install node and npm + + install-node-and-npm + + generate-resources + + v10.17.0 + 6.11.3 + + + + npm run install + + npm + + + install + + + + + + + + ${basedir}/docker + ${project.build.directory}/docker_assembly + false + + + + + + dev + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + create-reporting-folders + initialize + + + + + + + + + + + + com.github.eirslett + frontend-maven-plugin - - npm run documentation - - npm - - - false - run cucumber-docs - - install - + + ${project.basedir} + ${project.parent.parent.basedir} + - - - - - - - docker - - false - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources - package - - copy-resources - - - ${project.build.directory}/docker_assembly/cucumber - - - - ${basedir} - - features/**/* - stepDefinitions/**/* - plugins/**/* - resources/**/* - node_modules/**/* - cucumber-common/**/* - *.js* - - false - - - - - - - - io.fabric8 - docker-maven-plugin - - true - 1.23 - nexus3.onap.org:10001 - - - docker - docker - - - - - - onap/cucumber-sdc-api-tests - cucumber-sdc-api-tests - - try - ${project.build.directory}/docker_assembly - - latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} - - - - - - - - clean-images - pre-clean - - remove - - - true - onap/cucumber-sdc-api-tests - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - onap/cucumber-sdc-api-tests - - - - - - - - + + + + npm run install + + npm + + + install + + + + + npm run cucumber test + + npm + + + false + + run test-and-report + + test + + + + npm run documentation + + npm + + + false + + run cucumber-docs + + install + + + + + + + + + docker + + false + + + + + maven-resources-plugin + 3.0.2 + + + copy-resources + package + + copy-resources + + + + ${project.build.directory}/docker_assembly/cucumber + + + + ${basedir} + + features/**/* + stepDefinitions/**/* + plugins/**/* + resources/**/* + node_modules/**/* + cucumber-common/**/* + *.js* + + false + + + + + + + + io.fabric8 + docker-maven-plugin + + true + 1.23 + nexus3.onap.org:10001 + + + docker + docker + + + + + + onap/cucumber-sdc-api-tests + cucumber-sdc-api-tests + + try + ${project.build.directory}/docker_assembly + + + latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + + + + + + + + clean-images + pre-clean + + remove + + + true + onap/cucumber-sdc-api-tests + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + onap/cucumber-sdc-api-tests + + + + + + + + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2e6005b7b6..866e2ee80a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -21,8 +21,8 @@ limitations under the License. --> + 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"> 4.0.0 sdc-integration-tests @@ -302,10 +302,13 @@ limitations under the License. ${it.sdc-be.plugins} - ../catalog-be-plugins/etsi-nfv-nsd-csar-plugin/target + + ../catalog-be-plugins/etsi-nfv-nsd-csar-plugin/target + false - etsi-nfv-nsd-csar-plugin-${project.version}.jar + etsi-nfv-nsd-csar-plugin-${project.version}.jar + @@ -335,8 +338,9 @@ limitations under the License. + org.apache.maven.plugins maven-antrun-plugin - 1.8 + ${maven-antrun-plugin.version} set-folder-permission @@ -346,7 +350,9 @@ limitations under the License. - + @@ -358,9 +364,11 @@ limitations under the License. pre-integration-test - - + + @@ -416,7 +424,8 @@ limitations under the License. sdc-cs - ${it.chef.config}:/root/chef-solo/environments + ${it.chef.config}:/root/chef-solo/environments + @@ -468,7 +477,8 @@ limitations under the License. sdc-cs-init - ${it.chef.config}:/home/sdc/chef-solo/environments + ${it.chef.config}:/home/sdc/chef-solo/environments + @@ -501,7 +511,8 @@ limitations under the License. sdc-cs-onboard-init - ${it.chef.config}:/home/sdc/chef-solo/environments + ${it.chef.config}:/home/sdc/chef-solo/environments + @@ -523,19 +534,26 @@ limitations under the License. sdc-cassandra-onboard-init - ${it.cassandra.ssl.enabled} + ${it.cassandra.ssl.enabled} + ${it.sdc.cluster.name} ${it.sdc.user} ${it.sdc.password} ${it.env.name} onap/cert - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001 -Xmx1g -Xms1g + + -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001 + -Xmx1g -Xms1g + sdc-onboard-BE - ${it.chef.config}:/var/lib/jetty/chef-solo/environments - ${project.basedir}/src/test/resources/cert/onboarding-be:/var/lib/jetty/onap/cert + + ${it.chef.config}:/var/lib/jetty/chef-solo/environments + + + ${project.basedir}/src/test/resources/cert/onboarding-be:/var/lib/jetty/onap/cert ${it.shared.volume}:/var/lib/jetty/logs @@ -572,19 +590,26 @@ limitations under the License. sdc-cassandra-init - ${it.cassandra.ssl.enabled} + ${it.cassandra.ssl.enabled} + ${it.env.name} - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4000 - -Xmx1536m -Xms1536m + + -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4000 + -Xmx1536m -Xms1536m + onap/cert nsdCert sdc-BE - ${it.chef.config}:/var/lib/jetty/chef-solo/environments + + ${it.chef.config}:/var/lib/jetty/chef-solo/environments + ${it.shared.volume}:/var/lib/jetty/logs - ${project.basedir}/src/test/resources/cert/catalog-be:/var/lib/jetty/onap/cert + + ${project.basedir}/src/test/resources/cert/catalog-be:/var/lib/jetty/onap/cert + @@ -624,7 +649,9 @@ limitations under the License. sdc-BE-init - ${it.chef.config}:/home/onap/chef-solo/environments + + ${it.chef.config}:/home/onap/chef-solo/environments + ${it.shared.volume}:/var/lib/jetty/logs @@ -645,13 +672,17 @@ limitations under the License. ${it.env.name} - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:6000 - -Xmx256m -Xms256m + + -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:6000 + -Xmx256m -Xms256m + sdc-FE - ${it.chef.config}:/var/lib/jetty/chef-solo/environments + + ${it.chef.config}:/var/lib/jetty/chef-solo/environments + ${it.shared.volume}:/var/lib/jetty/logs ${it.chef.config}/plugins-configuration.yaml:/var/lib/jetty/config/catalog-fe/plugins-configuration.yaml @@ -697,7 +728,8 @@ limitations under the License. sdc-sim - ${it.chef.config}:/root/chef-solo/environments + ${it.chef.config}:/root/chef-solo/environments + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 190c269e89..0ab08d070f 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -52,12 +52,10 @@ 1.10 2.3 2.8 - 3.1.0 2.1.1 3.5.3 3.5.1 3.5.1 - 1.8 ${aspectj.version} @@ -90,7 +88,7 @@ 1.5.1 1.7.21 ${spring.version} - 2.0.8 + ${swagger-core-mvn-plugin.version} 4.4.1 1.0.2 1.0.2 diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index e57029be2a..bf5696e83b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -1,6 +1,6 @@ + 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"> 4.0.0 org.openecomp.sdc.onboarding @@ -30,12 +30,12 @@ openecomp-sdc-notification-api ${project.version} - + org.openecomp.sdc openecomp-sdc-notification-core ${project.version} - + org.openecomp.sdc.onboarding vnf-repository-rest-services ${project.version} @@ -231,17 +231,21 @@ + org.apache.maven.plugins maven-antrun-plugin + ${maven-antrun-plugin.version} generate-sources generate-sources - + - {"Version": "${project.version}"} - + {"Version": + "${project.version}"} + + run @@ -252,11 +256,15 @@ io.swagger.core.v3 swagger-maven-plugin + ${swagger-core-mvn-plugin.version} ${project.build.directory}/generated/swagger-ui swagger-sdce-1 JSON - ${project.basedir}/src/main/resources/swagger-config.yaml + + ${project.basedir}/src/main/resources/swagger-config.yaml + + ${swagger.skip} diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 903dab706b..07391a615e 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 api-docs org.openecomp.sdc.onboarding @@ -14,7 +14,8 @@ api-docs - ${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war + ${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war + api.json @@ -39,16 +40,20 @@ + org.apache.maven.plugins maven-antrun-plugin + ${maven-antrun-plugin.version} copy package - + - - + + run @@ -64,7 +69,7 @@ assembly/swagger.xml ${plugin.name} ${basedir}/target/${plugin.name} - false + false diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 15f8b716b7..a9a5f5f25c 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -15,8 +15,8 @@ --> + 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"> 4.0.0 openecomp-zusammen-tools @@ -175,15 +175,16 @@ org.apache.maven.plugins maven-antrun-plugin + ${maven-antrun-plugin.version} ant-test package - + - + includes="zusammenMainTool.sh"/> + run diff --git a/pom.xml b/pom.xml index 54612e7c93..4a6b5ba7de 100644 --- a/pom.xml +++ b/pom.xml @@ -20,15 +20,15 @@ Modifications copyright (c) 2018-2019 Nokia ================================================================================ --> + 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"> 4.0.0 - org.openecomp.sdc - sdc-main - 1.9.0-SNAPSHOT - pom - sdc + org.openecomp.sdc + sdc-main + 1.9.0-SNAPSHOT + pom + sdc org.onap.oparent @@ -65,6 +65,7 @@ Modifications copyright (c) 2018-2019 Nokia 0.10.3 3.0.7 2.1.7 + 3.0.0 4.1 2.1 @@ -86,7 +87,8 @@ Modifications copyright (c) 2018-2019 Nokia 1.1 - 1.2.15 + 1.2.15 + @@ -250,7 +252,7 @@ Modifications copyright (c) 2018-2019 Nokia io.swagger.core.v3 swagger-maven-plugin ${swagger-core-mvn-plugin.version} - + @@ -417,7 +419,8 @@ Modifications copyright (c) 2018-2019 Nokia 2.17 checkstyle-suppressions.xml - checkstyle.suppressions.file + checkstyle.suppressions.file + ${checkstyle.skip} @@ -493,12 +496,12 @@ Modifications copyright (c) 2018-2019 Nokia pom.properties['deploy.url'] = - pom.version.contains('-SNAPSHOT') ? - project.distributionManagement.snapshotRepository.url : - project.distributionManagement.repository.url; + pom.version.contains('-SNAPSHOT') ? + project.distributionManagement.snapshotRepository.url : + project.distributionManagement.repository.url; pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ? - project.distributionManagement.snapshotRepository.id : - project.distributionManagement.repository.id; + project.distributionManagement.snapshotRepository.id : + project.distributionManagement.repository.id; @@ -526,7 +529,8 @@ Modifications copyright (c) 2018-2019 Nokia false - ${project.build.directory}/jacoco.exec + ${project.build.directory}/jacoco.exec + ${surefire.forkCount} ${surefire.reuseForks} @@ -546,7 +550,8 @@ Modifications copyright (c) 2018-2019 Nokia true - ${project.build.outputDirectory}/META-INF/git.properties + + ${project.build.outputDirectory}/META-INF/git.properties true false @@ -682,6 +687,8 @@ Modifications copyright (c) 2018-2019 Nokia true true true + true + true onboarding -- cgit 1.2.3-korg