Human Interfaces for Read the Docs

[sdc.git] / sdc-os-chef / pom.xml

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index eb01a97..d58071d 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -78,7 +78,19 @@
                                     <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>
+                                    <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                       <include>*.jar</include>
+                                       </includes>
+                                </fileset>
+                                <!-- Sanity test suites -->
+                                <fileset>
+                                    <directory>${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites</directory>
+                                    <followSymlinks>false</followSymlinks>
+                                </fileset>
                             </filesets>
                         </configuration>
                     </execution>
@@ -323,6 +335,12 @@
                             <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
                             <registry>nexus3.onap.org:10003</registry>
+                            <authConfig>
+                                <pull>
+                                                   <username>docker</username>
+                                                   <password>docker</password>
+                                           </pull>
+                                   </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
@@ -410,7 +428,7 @@
                                         <tags>
                                             <tag>${docker.tag}</tag>
                                             <tag>${docker.latest.tag}</tag>
-                                            <tag>1.1-STAGING-latest</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -442,7 +460,6 @@
                                 <id>push-images</id>
                                 <phase>deploy</phase>
                                 <goals>
-                                    <goal>build</goal>
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>