diff options
| author |   eeginux <henry.xie@est.tech> | 2019-04-03 14:28:09 +0000 |
|---|---|---|
| committer | eeginux <henry.xie@est.tech> | 2019-04-04 11:41:31 +0100 |
| commit | 88c47a23b9428188ff5dd0b46941f8856465376b (patch) | |
| tree | 3f1e028033ad56f398e8154f0be2272012b666b2 /packages/docker | |
| parent | b168125f237629b6dd7d73897548f2ee70139ed3 (diff) | |
PNF WF post instantiation configuration
Add PNF ipv4/v6 address for config Deploy
Add Integration test for CreateVcpeResCustService_simplified.bpmn
Modify the PnfEventReadyDmaapClient to avoid one more running thread
Refactor the so-bpmn-infrastructure-flows test resources
Modify the CreateVcpeResCustService_simplified.bpmn
Add ConfigurePnfResource.bpmn
Add Delegates
Issue-ID: SO-1506
Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95
Signed-off-by: eeginux <henry.xie@est.tech>
Diffstat (limited to 'packages/docker')
| -rw-r--r-- | packages/docker/pom.xml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 49f6422f3f..6cef920dc5 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -23,6 +23,8 @@ <docker.skip.push>false</docker.skip.push> <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <docker.image.prefix>onap/so</docker.image.prefix> + <docker.push.phase>deploy</docker.push.phase> </properties> <build> @@ -72,7 +74,7 @@ <images> <image> - <name>onap/so/base-image:1.0</name> + <name>${docker.image.prefix}/base-image:1.0</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -80,7 +82,7 @@ </build> </image> <image> - <name>onap/so/vnfm-adapter</name> + <name>${docker.image.prefix}/vnfm-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -105,7 +107,7 @@ </build> </image> <image> - <name>onap/so/catalog-db-adapter</name> + <name>${docker.image.prefix}/catalog-db-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -130,7 +132,7 @@ </build> </image> <image> - <name>onap/so/request-db-adapter</name> + <name>${docker.image.prefix}/request-db-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -155,7 +157,7 @@ </build> </image> <image> - <name>onap/so/sdnc-adapter</name> + <name>${docker.image.prefix}/sdnc-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -180,7 +182,7 @@ </build> </image> <image> - <name>onap/so/openstack-adapter</name> + <name>${docker.image.prefix}/openstack-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -205,7 +207,7 @@ </build> </image> <image> - <name>onap/so/vfc-adapter</name> + <name>${docker.image.prefix}/vfc-adapter</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -230,7 +232,7 @@ </build> </image> <image> - <name>onap/so/sdc-controller</name> + <name>${docker.image.prefix}/sdc-controller</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -255,7 +257,7 @@ </build> </image> <image> - <name>onap/so/bpmn-infra</name> + <name>${docker.image.prefix}/bpmn-infra</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -280,7 +282,7 @@ </build> </image> <image> - <name>onap/so/api-handler-infra</name> + <name>${docker.image.prefix}/api-handler-infra</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -305,7 +307,7 @@ </build> </image> <image> - <name>onap/so/so-monitoring</name> + <name>${docker.image.prefix}/so-monitoring</name> <build> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -354,13 +356,13 @@ <execution> <id>push-images</id> - <phase>deploy</phase> + <phase>${docker.push.phase}</phase> <goals> <goal>build</goal> <goal>push</goal> </goals> <configuration> - <image>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/sdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra,onap/so/so-monitoring</image> + <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring</image> </configuration> </execution> </executions> |