From 8b1002a99724180cc9c134a04a5eb0763fde872c Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 8 Dec 2021 22:12:52 +0000 Subject: Improve fast-build profile Remove docker build from 'fast-build' profile Change-Id: I90b79bc05ecd159b5c6ff62f195507476dcdaa38 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3804 --- .../artifacts/Dockerfile | 2 +- .../dist/sdc-onboard-backend-docker/pom.xml | 298 +++++++++++---------- .../dist/sdc-onboard-db-init-docker/pom.xml | 258 +++++++++--------- 3 files changed, 283 insertions(+), 275 deletions(-) (limited to 'openecomp-be/dist') diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index f8d33d0248..012ebeec52 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -27,7 +27,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER USER onap #Download jetty -RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.41.v20210516/jetty-distribution-9.4.41.v20210516.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \ +RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \ tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \ rm -rf $JETTY_FOLDER/jetty.tar.gz RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index ca63d0236f..ddf1f9f598 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 openecomp-sdc-docker-backend @@ -18,159 +18,163 @@ sdc-onboard-backend - nexus3.onap.org:10001 - docker - docker - onap - - - - org.apache.maven.plugins - maven-clean-plugin - - - clean files - clean - - clean - - - - - ${project.basedir}/artifacts/ - false - - *.war - onboarding_configuration.yaml - logback.xml - - - - - - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources-war - verify - - copy-resources - - - ${project.basedir}/artifacts - - - - ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs - - - api-docs.war - - - - - ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target - - - onboarding-be-${project.version}.war - - - - - ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources - - - onboarding_configuration.yaml - - - - - ${project.parent.basedir}/../../catalog-be/src/main/resources/config - - - logback.xml - - - - - - - + + + docker + + false + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean files + clean + + clean + + + + + ${project.basedir}/artifacts/ + false + + *.war + onboarding_configuration.yaml + logback.xml + + + + + + + - - io.fabric8 - docker-maven-plugin - - ${verbose} - ${docker.api.version} - ${docker.registry} - - - ${docker.username} - ${docker.password} - - - + + maven-resources-plugin + 3.0.2 + + + copy-resources-war + verify + + copy-resources + + + ${project.basedir}/artifacts + + + + ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs + + + api-docs.war + + + + + ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target + + + onboarding-be-${project.version}.war + + + + + ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources + + + onboarding_configuration.yaml + + + + + ${project.parent.basedir}/../../catalog-be/src/main/resources/config + + + logback.xml + + + + + + + - - - ${docker.namespace}/${docker.image.name} - ${docker.image.name} - - try - ${project.basedir}/artifacts - - latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} - - - - - - - - clean-images - pre-clean - - remove - + + io.fabric8 + docker-maven-plugin - true - ${docker.namespace}/${docker.image.name} + ${verbose} + ${docker.api.version} + ${docker.registry} + + + ${docker.username} + ${docker.password} + + + + + + + ${docker.namespace}/${docker.image.name} + ${docker.image.name} + + try + ${project.basedir}/artifacts + + latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + + + - + + + clean-images + pre-clean + + remove + + + true + ${docker.namespace}/${docker.image.name} + + - - generate-images - install - - build - - + + generate-images + install + + build + + - - push-images - deploy - - push - - - ${docker.namespace}/${docker.image.name} - - - - - - + + push-images + deploy + + push + + + ${docker.namespace}/${docker.image.name} + + + + + + + + diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index 67e0bbe23b..5f8d4acc4c 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 openecomp-sdc-docker-db-init @@ -17,137 +17,141 @@ sdc-onboard-cassandra-init - onap - docker - docker - nexus3.onap.org:10001 - - - - org.apache.maven.plugins - maven-clean-plugin - - - clean-docker-artifacts - clean - - clean - - - - - - artifacts - - false - - init_keyspaces.cql - init_schemas.cql - upgrade-scripts/** - - - - - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources-war - verify - - copy-resources - - - ${project.basedir}/artifacts - - - - ${project.parent.basedir}/../../openecomp-be/tools/install/database - - - init_keyspaces.cql - init_schemas.cql - upgrade-scripts/** - - - - - - - - - io.fabric8 - docker-maven-plugin + + + docker + + false + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean-docker-artifacts + clean + + clean + + + + + + artifacts + + false + + init_keyspaces.cql + init_schemas.cql + upgrade-scripts/** + + + + + + + + + maven-resources-plugin + 3.0.2 + + + copy-resources-war + verify + + copy-resources + + + ${project.basedir}/artifacts + + + + ${project.parent.basedir}/../../openecomp-be/tools/install/database + + + init_keyspaces.cql + init_schemas.cql + upgrade-scripts/** + + + + + + + + + io.fabric8 + docker-maven-plugin - - ${verbose} - ${docker.api.version} - nexus3.onap.org:10001 - - - ${docker.username} - ${docker.password} - - - - - - - ${docker.namespace}/${docker.image.name} - ${docker.image.name} - - try - ${project.basedir}/artifacts - - latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} - - - - - - - - clean-images - pre-clean - - remove - - true - ${docker.namespace}/${docker.image.name} + ${verbose} + ${docker.api.version} + ${docker.registry} + + + ${docker.username} + ${docker.password} + + + + + + + ${docker.namespace}/${docker.image.name} + ${docker.image.name} + + try + ${project.basedir}/artifacts + + latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + + + - + + + clean-images + pre-clean + + remove + + + true + ${docker.namespace}/${docker.image.name} + + - - generate-images - install - - build - - + + generate-images + install + + build + + - - push-images - deploy - - push - - - ${docker.namespace}/${docker.image.name} - - - - - - + + push-images + deploy + + push + + + ${docker.namespace}/${docker.image.name} + + + + + + + + \ No newline at end of file -- cgit 1.2.3-korg