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 --- asdctool/pom.xml | 12 +- catalog-be-plugins/backend-all-plugins/pom.xml | 141 +++++----- .../src/main/docker/backend-all-plugins/Dockerfile | 4 +- catalog-be/pom.xml | 14 +- catalog-be/src/main/docker/backend/Dockerfile | 2 +- catalog-fe/pom.xml | 12 +- catalog-fe/sdc-frontend/Dockerfile | 2 +- cucumber-js-test-apis-ci/pom.xml | 10 +- integration-tests/pom.xml | 18 +- .../artifacts/Dockerfile | 2 +- .../dist/sdc-onboard-backend-docker/pom.xml | 298 +++++++++++---------- .../dist/sdc-onboard-db-init-docker/pom.xml | 258 +++++++++--------- pom.xml | 10 +- sdc-os-chef/pom.xml | 12 +- utils/webseal-simulator/pom.xml | 8 +- utils/webseal-simulator/sdc-simulator/Dockerfile | 2 +- 16 files changed, 411 insertions(+), 394 deletions(-) diff --git a/asdctool/pom.xml b/asdctool/pom.xml index a0423a3b77..e6a652113c 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -838,17 +838,17 @@ ${verbose} ${docker.api.version} - nexus3.onap.org:10001 + ${docker.registry} - docker - docker + ${docker.username} + ${docker.password} - onap/sdc-cassandra-init + ${docker.namespace}/sdc-cassandra-init sdc-cassandra-init try @@ -875,7 +875,7 @@ true - onap/sdc-cassandra-init + ${docker.namespace}/sdc-cassandra-init @@ -894,7 +894,7 @@ push - onap/sdc-cassandra-init + ${docker.namespace}/sdc-cassandra-init diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml index 1a61d62b6a..2c3ebab1fa 100644 --- a/catalog-be-plugins/backend-all-plugins/pom.xml +++ b/catalog-be-plugins/backend-all-plugins/pom.xml @@ -20,8 +20,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"> catalog-be-plugins org.openecomp.sdc @@ -43,6 +43,9 @@ limitations under the License. docker + + false + true false @@ -50,71 +53,75 @@ limitations under the License. false false + + + + io.fabric8 + docker-maven-plugin + + ${verbose} + ${docker.api.version} + ${docker.registry} + ${verbose} + + + ${docker.username} + ${docker.password} + + + + + + ${docker.namespace}/sdc-backend-all-plugins + sdc-backend-all-plugins + + try + backend-all-plugins/Dockerfile + + latest + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + + + + backend-all-plugins/backend-all-plugins-files.xml + + onap-sdc-backend-all-plugins + + + + + + + + clean-images + pre-clean + + remove + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + + + - - - - io.fabric8 - docker-maven-plugin - - ${verbose} - ${docker.api.version} - nexus3.onap.org:10001 - ${verbose} - - - docker - docker - - - - - - onap/sdc-backend-all-plugins - sdc-backend-all-plugins - - try - backend-all-plugins/Dockerfile - - latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} - - - backend-all-plugins/backend-all-plugins-files.xml - onap-sdc-backend-all-plugins - - - - - - - - clean-images - pre-clean - - remove - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - - - - \ No newline at end of file diff --git a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile index ca723094f1..159fde430e 100644 --- a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile +++ b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile @@ -1,3 +1,3 @@ -FROM onap/sdc-backend:latest +FROM ${docker.namespace}/sdc-backend:latest -COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/ \ No newline at end of file +COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/ \ No newline at end of file diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 842407eb1d..5058dc2d36 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -1369,18 +1369,18 @@ ${verbose} ${docker.api.version} - nexus3.onap.org:10001 + ${docker.registry} - docker - docker + ${docker.username} + ${docker.password} - onap/sdc-backend + ${docker.namespace}/sdc-backend sdc-backend try @@ -1402,7 +1402,7 @@ - onap/sdc-backend-init + ${docker.namespace}/sdc-backend-init sdc-backend-init try @@ -1430,7 +1430,7 @@ true - onap/sdc-backend,onap/sdc-backend-init + ${docker.namespace}/sdc-backend,onap/sdc-backend-init @@ -1449,7 +1449,7 @@ push - onap/sdc-backend,onap/sdc-backend-init + ${docker.namespace}/sdc-backend,onap/sdc-backend-init diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile index dabea05042..5e49f57202 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -26,7 +26,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 diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index a43dd9a813..3848d2e8b5 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -599,10 +599,6 @@ false - - docker - docker - @@ -641,7 +637,7 @@ ${verbose} ${docker.api.version} - nexus3.onap.org:10001 + ${docker.registry} ${docker.username} @@ -652,7 +648,7 @@ - onap/sdc-frontend + ${docker.namespace}/sdc-frontend sdc-frontend try @@ -679,7 +675,7 @@ true - onap/sdc-frontend + ${docker.namespace}/sdc-frontend @@ -698,7 +694,7 @@ push - onap/sdc-frontend + ${docker.namespace}/sdc-frontend diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 9e5fad6c88..005e5c9d2b 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -26,7 +26,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/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml index a10fef6fcf..c37503cd4a 100644 --- a/cucumber-js-test-apis-ci/pom.xml +++ b/cucumber-js-test-apis-ci/pom.xml @@ -230,8 +230,8 @@ docker-maven-plugin true - 1.23 - nexus3.onap.org:10001 + ${docker.api.version} + ${docker.registry} docker @@ -241,7 +241,7 @@ - onap/cucumber-sdc-api-tests + ${docker.namespace}/cucumber-sdc-api-tests cucumber-sdc-api-tests try @@ -269,7 +269,7 @@ true - onap/cucumber-sdc-api-tests + ${docker.namespace}/cucumber-sdc-api-tests @@ -286,7 +286,7 @@ push - onap/cucumber-sdc-api-tests + ${docker.namespace}/cucumber-sdc-api-tests diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ad886c50f1..cf546a6134 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -476,7 +476,7 @@ limitations under the License. true - onap/sdc-cassandra:${it.docker.version} + ${docker.namespace}/sdc-cassandra:${it.docker.version} sdc-cassandra @@ -526,7 +526,7 @@ limitations under the License. - onap/sdc-cassandra-init:${it.docker.version} + ${docker.namespace}/sdc-cassandra-init:${it.docker.version} sdc-cassandra-init @@ -559,7 +559,7 @@ limitations under the License. - onap/sdc-onboard-cassandra-init:${it.docker.version} + ${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version} sdc-cassandra-onboard-init @@ -593,7 +593,7 @@ limitations under the License. - onap/sdc-onboard-backend:${it.docker.version} + ${docker.namespace}/sdc-onboard-backend:${it.docker.version} sdc-onboard-backend @@ -646,7 +646,7 @@ limitations under the License. - onap/sdc-backend-all-plugins:${it.docker.version} + ${docker.namespace}/sdc-backend-all-plugins:${it.docker.version} sdc-backend @@ -698,7 +698,7 @@ limitations under the License. - onap/sdc-backend-init:${it.docker.version} + ${docker.namespace}/sdc-backend-init:${it.docker.version} sdc-backend-init @@ -728,7 +728,7 @@ limitations under the License. - onap/sdc-frontend:${it.docker.version} + ${docker.namespace}/sdc-frontend:${it.docker.version} sdc-frontend @@ -774,7 +774,7 @@ limitations under the License. - onap/sdc-simulator:${it.docker.version} + ${docker.namespace}/sdc-simulator:${it.docker.version} sdc-simulator @@ -860,7 +860,7 @@ limitations under the License. - onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version} + ${docker.namespace}/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version} helm-validator ${it.helm-validator.disabled} 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 diff --git a/pom.xml b/pom.xml index 5944093eb3..fa98150b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -182,9 +182,15 @@ Modifications copyright (c) 2018-2019 Nokia true false - 1.35 1.69 + + 1.41 + onap + docker + docker + nexus3.onap.org:10001 + false @@ -383,7 +389,7 @@ Modifications copyright (c) 2018-2019 Nokia io.fabric8 docker-maven-plugin - 0.31.0 + 0.38.0 org.apache.maven.plugins diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index f9d4352220..7374cb4680 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -61,18 +61,18 @@ ${verbose} ${docker.api.version} - nexus3.onap.org:10001 + ${docker.registry} - docker - docker + ${docker.username} + ${docker.password} - onap/sdc-cassandra + ${docker.namespace}/sdc-cassandra sdc-cassandra try @@ -98,7 +98,7 @@ true - onap/sdc-cassandra + ${docker.namespace}/sdc-cassandra @@ -117,7 +117,7 @@ push - onap/sdc-cassandra + ${docker.namespace}/sdc-cassandra diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 7f1db049a6..ddd56ed5d6 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -232,17 +232,17 @@ ${verbose} ${docker.api.version} - nexus3.onap.org:10001 + ${docker.registry} - docker - docker + ${docker.username} + ${docker.password} - onap/sdc-simulator + ${docker.namespace}/sdc-simulator sdc-simulator try diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 4c5e0ba319..7406cda9f3 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -26,7 +26,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 -- cgit 1.2.3-korg