diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-07-15 08:22:16 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2019-07-15 08:29:36 +0000 |
| commit | 612d8c0e3c8c23b24f2378b1f91e803c546d1644 (patch) | |
| tree | 9232a4e5cabeb3c4b4098e88fd7b46ae12361615 | |
| parent | 263f17d303aae3f8f65577eb06ea65e314f47834 (diff) | |
Add docker profile for openstack modules
Change-Id: I43094436b2b344fe681261a830755a89e8ab2fcc
Issue-ID: MULTICLOUD-704
Signed-off-by: Bin Yang <bin.yang@windriver.com>
| -rw-r--r-- | fcaps/pom.xml | 72 | ||||
| -rw-r--r-- | lenovo/pom.xml | 72 | ||||
| -rw-r--r-- | newton/pom.xml | 72 | ||||
| -rw-r--r-- | ocata/pom.xml | 72 | ||||
| -rw-r--r-- | pike/pom.xml | 72 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | starlingx/pom.xml | 72 | ||||
| -rw-r--r-- | windriver/pom.xml | 10 |
8 files changed, 437 insertions, 7 deletions
diff --git a/fcaps/pom.xml b/fcaps/pom.xml index 46917bdd..ce627360 100644 --- a/fcaps/pom.xml +++ b/fcaps/pom.xml @@ -113,4 +113,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-fcaps:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-fcaps:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-fcaps:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-fcaps:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-fcaps:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> diff --git a/lenovo/pom.xml b/lenovo/pom.xml index cb361a56..847d6f72 100644 --- a/lenovo/pom.xml +++ b/lenovo/pom.xml @@ -113,4 +113,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-lenovo:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-lenovo:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-lenovo:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-lenovo:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-lenovo:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> diff --git a/newton/pom.xml b/newton/pom.xml index d04fab33..58f3908e 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -114,4 +114,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-newton:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-newton:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-newton:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-newton:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-newton:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> diff --git a/ocata/pom.xml b/ocata/pom.xml index 6ff8c8b0..8ecf4f4a 100644 --- a/ocata/pom.xml +++ b/ocata/pom.xml @@ -113,4 +113,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-ocata:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-ocata:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-ocata:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-ocata:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-ocata:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> diff --git a/pike/pom.xml b/pike/pom.xml index 672d2485..748e1c87 100644 --- a/pike/pom.xml +++ b/pike/pom.xml @@ -113,4 +113,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-pike:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-pike:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-pike:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-pike:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-pike:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> @@ -35,8 +35,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <nexusproxy>https://nexus.onap.org</nexusproxy> - <container-public-registry>nexus3.onap.org:10001</container-public-registry> - <container-staging-registry>nexus3.onap.org:10003</container-staging-registry> </properties> <modules> diff --git a/starlingx/pom.xml b/starlingx/pom.xml index 83dd656a..db0cbdd2 100644 --- a/starlingx/pom.xml +++ b/starlingx/pom.xml @@ -113,4 +113,76 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/docker_target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/docker</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>install</phase> + <inherited>false</inherited> + <configuration> + <target> + <exec executable="docker"> + <arg value="build"/> + <arg value="-t"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-starlingx:${project.version}"/> + <arg value="docker_target"/> + </exec> + <exec executable="docker"> + <arg value="tag"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-starlingx:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-starlingx:latest"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-starlingx:${project.version}"/> + </exec> + <exec executable="docker"> + <arg value="push"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-starlingx:latest"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> </project> diff --git a/windriver/pom.xml b/windriver/pom.xml index 1eb5a1c6..7299038d 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -154,21 +154,21 @@ <exec executable="docker"> <arg value="build"/> <arg value="-t"/> - <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-windriver:${project.version}"/> <arg value="docker_target"/> </exec> <exec executable="docker"> <arg value="tag"/> - <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/> - <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:latest"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-windriver:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-windriver:latest"/> </exec> <exec executable="docker"> <arg value="push"/> - <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-windriver:${project.version}"/> </exec> <exec executable="docker"> <arg value="push"/> - <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:latest"/> + <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/openstack-windriver:latest"/> </exec> </target> </configuration> |