diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2021-12-08 22:12:52 +0000 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2021-12-09 09:44:10 +0000 |
| commit | 8b1002a99724180cc9c134a04a5eb0763fde872c (patch) | |
| tree | 8e1061f97b28c193d9448885eea3bb2be4f68077 | |
| parent | afa3fb50409b8c68e35db42e77a962b76702f8d9 (diff) | |
Improve fast-build profile
Remove docker build from 'fast-build' profile
Change-Id: I90b79bc05ecd159b5c6ff62f195507476dcdaa38
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3804
| -rw-r--r-- | asdctool/pom.xml | 12 | ||||
| -rw-r--r-- | catalog-be-plugins/backend-all-plugins/pom.xml | 141 | ||||
| -rw-r--r-- | catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile | 4 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 14 | ||||
| -rw-r--r-- | catalog-be/src/main/docker/backend/Dockerfile | 2 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 12 | ||||
| -rw-r--r-- | catalog-fe/sdc-frontend/Dockerfile | 2 | ||||
| -rw-r--r-- | cucumber-js-test-apis-ci/pom.xml | 10 | ||||
| -rw-r--r-- | integration-tests/pom.xml | 18 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile | 2 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-backend-docker/pom.xml | 298 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml | 258 | ||||
| -rw-r--r-- | pom.xml | 10 | ||||
| -rw-r--r-- | sdc-os-chef/pom.xml | 12 | ||||
| -rw-r--r-- | utils/webseal-simulator/pom.xml | 8 | ||||
| -rw-r--r-- | 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 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build cassandra-init image --> <image> - <name>onap/sdc-cassandra-init</name> + <name>${docker.namespace}/sdc-cassandra-init</name> <alias>sdc-cassandra-init</alias> <build> <cleanup>try</cleanup> @@ -875,7 +875,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/sdc-cassandra-init</image> + <image>${docker.namespace}/sdc-cassandra-init</image> </configuration> </execution> @@ -894,7 +894,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/sdc-cassandra-init</image> + <image>${docker.namespace}/sdc-cassandra-init</image> </configuration> </execution> </executions> 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. --> <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"> + 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"> <parent> <artifactId>catalog-be-plugins</artifactId> <groupId>org.openecomp.sdc</groupId> @@ -43,6 +43,9 @@ limitations under the License. <profiles> <profile> <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> <properties> <skip.staging.artifacts>true</skip.staging.artifacts> <docker.skip.build>false</docker.skip.build> @@ -50,71 +53,75 @@ limitations under the License. <docker.skip.push>false</docker.skip.push> <docker.skip>false</docker.skip> </properties> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <verbose>${verbose}</verbose> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + <!-- Build backend image --> + <image> + <name>${docker.namespace}/sdc-backend-all-plugins</name> + <alias>sdc-backend-all-plugins</alias> + <build> + <cleanup>try</cleanup> + <dockerFile>backend-all-plugins/Dockerfile</dockerFile> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + </tag> + </tags> + <assembly> + <descriptor> + backend-all-plugins/backend-all-plugins-files.xml + </descriptor> + <name>onap-sdc-backend-all-plugins</name> + </assembly> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + </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> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>${verbose}</verbose> - <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> - <verbose>${verbose}</verbose> - <authConfig> - <pull> - <username>docker</username> - <password>docker</password> - </pull> - </authConfig> - <images> - <!-- Build backend image --> - <image> - <name>onap/sdc-backend-all-plugins</name> - <alias>sdc-backend-all-plugins</alias> - <build> - <cleanup>try</cleanup> - <dockerFile>backend-all-plugins/Dockerfile</dockerFile> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> - </tags> - <assembly> - <descriptor>backend-all-plugins/backend-all-plugins-files.xml</descriptor> - <name>onap-sdc-backend-all-plugins</name> - </assembly> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - </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> - </execution> - </executions> - </plugin> - </plugins> - </build> </project>
\ 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 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build backend image --> <image> - <name>onap/sdc-backend</name> + <name>${docker.namespace}/sdc-backend</name> <alias>sdc-backend</alias> <build> <cleanup>try</cleanup> @@ -1402,7 +1402,7 @@ </image> <!-- Build backend-init image --> <image> - <name>onap/sdc-backend-init</name> + <name>${docker.namespace}/sdc-backend-init</name> <alias>sdc-backend-init</alias> <build> <cleanup>try</cleanup> @@ -1430,7 +1430,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/sdc-backend,onap/sdc-backend-init</image> + <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image> </configuration> </execution> @@ -1449,7 +1449,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/sdc-backend,onap/sdc-backend-init</image> + <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image> </configuration> </execution> </executions> 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 @@ <activation> <activeByDefault>false</activeByDefault> </activation> - <properties> - <docker.username>docker</docker.username> - <docker.password>docker</docker.password> - </properties> <build> <plugins> <plugin> @@ -641,7 +637,7 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> <username>${docker.username}</username> @@ -652,7 +648,7 @@ <!-- Build frontend image --> <image> - <name>onap/sdc-frontend</name> + <name>${docker.namespace}/sdc-frontend</name> <alias>sdc-frontend</alias> <build> <cleanup>try</cleanup> @@ -679,7 +675,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/sdc-frontend</image> + <image>${docker.namespace}/sdc-frontend</image> </configuration> </execution> @@ -698,7 +694,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/sdc-frontend</image> + <image>${docker.namespace}/sdc-frontend</image> </configuration> </execution> </executions> 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 @@ <artifactId>docker-maven-plugin</artifactId> <configuration> <verbose>true</verbose> - <apiVersion>1.23</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> <authConfig> <pull> <username>docker</username> @@ -241,7 +241,7 @@ <images> <!-- Build sanity image --> <image> - <name>onap/cucumber-sdc-api-tests</name> + <name>${docker.namespace}/cucumber-sdc-api-tests</name> <alias>cucumber-sdc-api-tests</alias> <build> <cleanup>try</cleanup> @@ -269,7 +269,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/cucumber-sdc-api-tests</image> + <image>${docker.namespace}/cucumber-sdc-api-tests</image> </configuration> </execution> <execution> @@ -286,7 +286,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/cucumber-sdc-api-tests</image> + <image>${docker.namespace}/cucumber-sdc-api-tests</image> </configuration> </execution> </executions> 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. <startParallel>true</startParallel> <images> <image> - <name>onap/sdc-cassandra:${it.docker.version}</name> + <name>${docker.namespace}/sdc-cassandra:${it.docker.version}</name> <alias>sdc-cassandra</alias> <run> <env> @@ -526,7 +526,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-cassandra-init:${it.docker.version}</name> + <name>${docker.namespace}/sdc-cassandra-init:${it.docker.version}</name> <alias>sdc-cassandra-init</alias> <run> <dependsOn> @@ -559,7 +559,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-onboard-cassandra-init:${it.docker.version}</name> + <name>${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version}</name> <alias>sdc-cassandra-onboard-init</alias> <run> <dependsOn> @@ -593,7 +593,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-onboard-backend:${it.docker.version}</name> + <name>${docker.namespace}/sdc-onboard-backend:${it.docker.version}</name> <alias>sdc-onboard-backend</alias> <run> <dependsOn> @@ -646,7 +646,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-backend-all-plugins:${it.docker.version}</name> + <name>${docker.namespace}/sdc-backend-all-plugins:${it.docker.version}</name> <alias>sdc-backend</alias> <run> <dependsOn> @@ -698,7 +698,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-backend-init:${it.docker.version}</name> + <name>${docker.namespace}/sdc-backend-init:${it.docker.version}</name> <alias>sdc-backend-init</alias> <run> <dependsOn> @@ -728,7 +728,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-frontend:${it.docker.version}</name> + <name>${docker.namespace}/sdc-frontend:${it.docker.version}</name> <alias>sdc-frontend</alias> <run> <env> @@ -774,7 +774,7 @@ limitations under the License. </run> </image> <image> - <name>onap/sdc-simulator:${it.docker.version}</name> + <name>${docker.namespace}/sdc-simulator:${it.docker.version}</name> <alias>sdc-simulator</alias> <run> <env> @@ -860,7 +860,7 @@ limitations under the License. </run> </image> <image> - <name>onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}</name> + <name>${docker.namespace}/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}</name> <alias>helm-validator</alias> <run> <skip>${it.helm-validator.disabled}</skip> 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 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 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> <name>openecomp-sdc-docker-backend</name> @@ -18,159 +18,163 @@ <properties> <docker.image.name>sdc-onboard-backend</docker.image.name> - <docker.registry>nexus3.onap.org:10001</docker.registry> - <docker.password>docker</docker.password> - <docker.username>docker</docker.username> - <docker.namespace>onap</docker.namespace> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>clean files</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${project.basedir}/artifacts/</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>*.war</include> - <include>onboarding_configuration.yaml</include> - <include>logback.xml</include> - </includes> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-resources-war</id> - <phase>verify</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}/artifacts</outputDirectory> - <resources> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs - </directory> - <includes> - <include>api-docs.war</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target - </directory> - <includes> - <include>onboarding-be-${project.version}.war</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources - </directory> - <includes> - <include>onboarding_configuration.yaml</include> - </includes> - </resource> - <resource> - <directory> - ${project.parent.basedir}/../../catalog-be/src/main/resources/config - </directory> - <includes> - <include>logback.xml</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean files</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/artifacts/</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + <include>onboarding_configuration.yaml</include> + <include>logback.xml</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>${verbose}</verbose> - <apiVersion>${docker.api.version}</apiVersion> - <registry>${docker.registry}</registry> - <authConfig> - <pull> - <username>${docker.username}</username> - <password>${docker.password}</password> - </pull> - </authConfig> - <images> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-resources-war</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/artifacts</outputDirectory> + <resources> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs + </directory> + <includes> + <include>api-docs.war</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target + </directory> + <includes> + <include>onboarding-be-${project.version}.war</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/resources + </directory> + <includes> + <include>onboarding_configuration.yaml</include> + </includes> + </resource> + <resource> + <directory> + ${project.parent.basedir}/../../catalog-be/src/main/resources/config + </directory> + <includes> + <include>logback.xml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <!-- Build backend image --> - <image> - <name>${docker.namespace}/${docker.image.name}</name> - <alias>${docker.image.name}</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> <configuration> - <removeAll>true</removeAll> - <image>${docker.namespace}/${docker.image.name}</image> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + + <!-- Build backend image --> + <image> + <name>${docker.namespace}/${docker.image.name}</name> + <alias>${docker.image.name}</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> + </tags> + </build> + </image> + </images> </configuration> - </execution> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</goal> - </goals> - </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>${docker.namespace}/${docker.image.name}</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> 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 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 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> <name>openecomp-sdc-docker-db-init</name> @@ -17,137 +17,141 @@ <properties> <docker.image.name>sdc-onboard-cassandra-init</docker.image.name> - <docker.namespace>onap</docker.namespace> - <docker.password>docker</docker.password> - <docker.username>docker</docker.username> - <docker.registry>nexus3.onap.org:10001</docker.registry> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>clean-docker-artifacts</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory> - artifacts - </directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>init_keyspaces.cql</include> - <include>init_schemas.cql</include> - <include>upgrade-scripts/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-resources-war</id> - <phase>verify</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.basedir}/artifacts</outputDirectory> - <resources> - <resource> - <directory> - ${project.parent.basedir}/../../openecomp-be/tools/install/database - </directory> - <includes> - <include>init_keyspaces.cql</include> - <include>init_schemas.cql</include> - <include>upgrade-scripts/**</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean-docker-artifacts</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory> + artifacts + </directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>init_keyspaces.cql</include> + <include>init_schemas.cql</include> + <include>upgrade-scripts/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-resources-war</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/artifacts</outputDirectory> + <resources> + <resource> + <directory> + ${project.parent.basedir}/../../openecomp-be/tools/install/database + </directory> + <includes> + <include>init_keyspaces.cql</include> + <include>init_schemas.cql</include> + <include>upgrade-scripts/**</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> - <configuration> - <verbose>${verbose}</verbose> - <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> - <authConfig> - <pull> - <username>${docker.username}</username> - <password>${docker.password}</password> - </pull> - </authConfig> - <images> - - <!-- Build backend image --> - <image> - <name>${docker.namespace}/${docker.image.name}</name> - <alias>${docker.image.name}</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> - <tags> - <tag>latest</tag> - <tag> - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - </tag> - <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</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>${docker.namespace}/${docker.image.name}</image> + <verbose>${verbose}</verbose> + <apiVersion>${docker.api.version}</apiVersion> + <registry>${docker.registry}</registry> + <authConfig> + <pull> + <username>${docker.username}</username> + <password>${docker.password}</password> + </pull> + </authConfig> + <images> + + <!-- Build backend image --> + <image> + <name>${docker.namespace}/${docker.image.name}</name> + <alias>${docker.image.name}</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.basedir}/artifacts</dockerFileDir> + <tags> + <tag>latest</tag> + <tag> + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + </tag> + <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag> + </tags> + </build> + </image> + </images> </configuration> - </execution> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</goal> - </goals> - </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>${docker.namespace}/${docker.image.name}</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>${docker.namespace}/${docker.image.name}</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
\ No newline at end of file @@ -182,9 +182,15 @@ Modifications copyright (c) 2018-2019 Nokia <surefire.reuseForks>true</surefire.reuseForks> <surefire.skip.tests>false</surefire.skip.tests> - <docker.api.version>1.35</docker.api.version> <bouncycastle.version>1.69</bouncycastle.version> + <!--DOCKER--> + <docker.api.version>1.41</docker.api.version> + <docker.namespace>onap</docker.namespace> + <docker.password>docker</docker.password> + <docker.username>docker</docker.username> + <docker.registry>nexus3.onap.org:10001</docker.registry> + <verbose>false</verbose> </properties> @@ -383,7 +389,7 @@ Modifications copyright (c) 2018-2019 Nokia <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.31.0</version> + <version>0.38.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 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 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build cassandra image --> <image> - <name>onap/sdc-cassandra</name> + <name>${docker.namespace}/sdc-cassandra</name> <alias>sdc-cassandra</alias> <build> <cleanup>try</cleanup> @@ -98,7 +98,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/sdc-cassandra</image> + <image>${docker.namespace}/sdc-cassandra</image> </configuration> </execution> @@ -117,7 +117,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/sdc-cassandra</image> + <image>${docker.namespace}/sdc-cassandra</image> </configuration> </execution> </executions> 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 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build simulator image --> <image> - <name>onap/sdc-simulator</name> + <name>${docker.namespace}/sdc-simulator</name> <alias>sdc-simulator</alias> <build> <cleanup>try</cleanup> 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 |