diff options
| author |   Yuli Shlosberg <ys9693@att.com> | 2017-11-26 19:05:23 +0200 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2017-11-27 08:49:27 +0000 |
| commit | 0566f581c0f310384f42838c388f57234ed1d60e (patch) | |
| tree | dd782da7ebd4ce591876865a564b9c1f65eb5e66 /sdc-os-chef/pom.xml | |
| parent | 4d8033eeb036943c05b3a5752b8f4cd4d705272f (diff) | |
sync 1.1.0 to master
Change-Id: I6e040f039895dd2ced55f95824473946b226fb5d
Issue-ID: SDC-707
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'sdc-os-chef/pom.xml')
| -rw-r--r-- | sdc-os-chef/pom.xml | 69 |
1 files changed, 50 insertions, 19 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index f0bf6ec9ff..a14dfc5ae1 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -33,24 +33,17 @@ </goals> <configuration> <filesets> - <fileset> - <directory>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>**/default.rb</include> - </includes> - </fileset> <!-- static configuration files --> <fileset> <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory> <followSymlinks>false</followSymlinks> <includes> - <include>Artifact-Generator.properties</include> - <include>error-configuration.yaml</include> - <include>ecomp-error-configuration.yaml</include> - <include>logback.xml</include> - </includes> - </fileset> + <include>Artifact-Generator.properties</include> + <include>error-configuration.yaml</include> + <include>ecomp-error-configuration.yaml</include> + <include>logback.xml</include> + </includes> + </fileset> <!-- BE WAR's --> <fileset> <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend</directory> @@ -74,6 +67,17 @@ <include>normatives.tar.gz</include> </includes> </fileset> + <fileset> + <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>**/default.rb</include> + </includes> + </fileset> + <fileset> + <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools</directory> + <followSymlinks>false</followSymlinks> + </fileset> <!-- Sanity jar --> <fileset> <directory>${project.basedir}/sdc-sanity</directory> @@ -104,7 +108,7 @@ ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb </path> <lines> - <line>normal['version'] = "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line> + <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line> </lines> </file> </files> @@ -255,6 +259,7 @@ </resources> </configuration> </execution> + <execution> <id>copy-resources-test-apis-ci</id> <phase>validate</phase> @@ -273,6 +278,33 @@ </resources> </configuration> </execution> + + + <execution> + <id>copy-dox-files</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default</outputDirectory> + <resources> + <resource> + <directory>${project.parent.basedir}/openecomp-be</directory> + <includes> + <include>tools/build/**</include> + </includes> + </resource> + <resource> + <directory>${project.parent.basedir}/openecomp-be</directory> + <includes> + <include>tools/install/**</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> <id>copy-normatives</id> <phase>validate</phase> @@ -306,11 +338,10 @@ <registry>nexus3.onap.org:10001</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> - </pull> - </authConfig> - + <username>docker</username> + <password>docker</password> + </pull> + </authConfig> <images> <!-- Build backend image --> |