diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-07-03 15:20:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-03 15:20:21 +0000 |
| commit | f6d5b0b1389e48c890f47e07cce720145adedee5 (patch) | |
| tree | 6a87002aae563d85f6bacc18d0176634e1ef5004 /odlsli/pom.xml | |
| parent | 9cad35bcef917ed7e01f9363cfe8b7c79d36be81 (diff) | |
| parent | be94cc1a5b68a5e789989f898a33be3becb13068 (diff) | |
Merge "Install ansible apt repo manually"
Diffstat (limited to 'odlsli/pom.xml')
| -rw-r--r-- | odlsli/pom.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/odlsli/pom.xml b/odlsli/pom.xml index d9aa5a2b..1b573601 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -30,6 +30,7 @@ <opendaylight.root>opt/opendaylight</opendaylight.root> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> + <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> </properties> <dependencies> @@ -177,6 +178,14 @@ </dependencies> <build> + <extensions> + <extension> + <!-- this extension is required by wagon in order to pass the proxy --> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + <version>2.2</version> + </extension> + </extensions> <plugins> @@ -197,7 +206,8 @@ versionArray = project.properties['ccsdk.project.version'].split('\\.'); } - if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) { + if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) + { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } else { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; @@ -271,6 +281,7 @@ <include>idmlight.db.mv.db</include> <include>org.ops4j.pax.logging.cfg</include> <include>install_ccsdk.yml</include> + <include>ansible-sources.list</include> </includes> <filtering>false</filtering> </resource> |