Disable staging plugins

Disable staging plugin to avoid interfering with staging Jenkins job

Change-Id: If35283e981a8862047d67c7e586240ed80974061
Issue-ID: CCSDK-1166
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 29de7fc..e3ca709 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/ansible-server/src/main/scripts/startAnsibleServer.sh b/ansible-server/src/main/scripts/startAnsibleServer.sh
index 5101847..03b1498 100644 (file)
--- a/ansible-server/src/main/scripts/startAnsibleServer.sh
+++ b/ansible-server/src/main/scripts/startAnsibleServer.sh
@@ -3,8 +3,20 @@ exec &> >(tee -a "/var/log/ansible-server.log")
 
 if [ ! -f /tmp/.ansible-server-installed ]
 then
-    cp /etc/ansible/ansible.cfg /etc/ansible/ansible.cfg.orig
-    cat /etc/ansible/ansible.cfg.orig | sed -e 's/#host_key_checking/host_key_checking/' > /etc/ansible/ansible.cfg
+       if [ -f /etc/ansible/ansible.cfg ]
+       then
+               cp /etc/ansible/ansible.cfg /etc/ansible/ansible.cfg.orig
+        cat /etc/ansible/ansible.cfg.orig | sed -e 's/#host_key_checking/host_key_checking/' > /etc/ansible/ansible.cfg
+    else
+       if [ ! -d /etc/ansible ]
+       then
+               mkdir /etc/ansible
+        fi
+        cat > /etc/ansible/ansible.cfg <<-END
+[defaults]
+host_key_checking = False
+END
+    fi
     date > /tmp/.ansible-server-installed 2>&1
 fi
 

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 51b94b3..0bfad15 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
         <relativePath/>
     </parent>
 

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index d1de806..552ddf8 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 9796e17..23df591 100644 (file)
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.3</version>
-               <relativePath />
+               <version>1.1.4</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>

diff --git a/pom.xml b/pom.xml
index dc6b29a..9e161aa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.3</version>
+               <version>1.1.4</version>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
@@ -38,19 +36,4 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        </properties>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
-                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-                                       <serverId>${onap.nexus.staging.server-id}</serverId>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
 </project>