Merge "dovetail: separate dovetail jenkins job"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 064b89c..5c1bded 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -297,7 +297,7 @@
 
     builders:
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters:
               OPNFV_CLEAN=yes
             git-revision: false
@@ -306,7 +306,7 @@
         - trigger-builds:
           - project: 'cperf-apex-intel-pod2-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
             block: true
             same-node: true
 

diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml
index 4afe40e..41a80ad 100644 (file)
--- a/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@ -115,8 +115,8 @@
             pwd
             cd src
             ./install_build_deps.sh
-            sudo make clobber
-            sudo make
+            make clobber
+            make
 
 - job-template:
     name: 'barometer-daily-{stream}'
@@ -152,5 +152,5 @@
             pwd
             cd src
             ./install_build_deps.sh
-            sudo make clobber
-            sudo make
+            make clobber
+            make

diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index c8d6159..f89d04e 100644 (file)
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -38,6 +38,10 @@ else
     export NETWORK_CONF_FILE=network.yml
 fi
 
+if [[ "$NODE_NAME" =~ "intel-pod8" ]]; then
+    export OS_MGMT_NIC=em4
+fi
+
 if [[ "$NODE_NAME" =~ "-virtual" ]]; then
     export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml

diff --git a/modules/opnfv/installer_adapters/InstallerHandler.py b/modules/opnfv/installer_adapters/InstallerHandler.py
index e353ef3..dc5bdb9 100644 (file)
--- a/modules/opnfv/installer_adapters/InstallerHandler.py
+++ b/modules/opnfv/installer_adapters/InstallerHandler.py
@@ -11,9 +11,10 @@ from opnfv.installer_adapters.fuel.FuelAdapter import FuelAdapter
 from opnfv.installer_adapters.apex.ApexAdapter import ApexAdapter
 from opnfv.installer_adapters.compass.CompassAdapter import CompassAdapter
 from opnfv.installer_adapters.joid.JoidAdapter import JoidAdapter
+from opnfv.installer_adapters.daisy.DaisyAdapter import DaisyAdapter
 
 
-INSTALLERS = ["fuel", "apex", "compass", "joid"]
+INSTALLERS = ["fuel", "apex", "compass", "joid", "daisy"]
 
 
 class InstallerHandler:
@@ -38,6 +39,8 @@ class InstallerHandler:
             self.InstallerAdapter = CompassAdapter(self.installer_ip)
         elif self.installer == INSTALLERS[3]:
             self.InstallerAdapter = JoidAdapter(self.installer_ip)
+        elif self.installer == INSTALLERS[4]:
+            self.InstallerAdapter = DaisyAdapter(self.installer_ip)
         else:
             print("Installer %s is  not valid. "
                   "Please use one of the followings: %s"

diff --git a/modules/opnfv/installer_adapters/daisy/DaisyAdapter.py b/modules/opnfv/installer_adapters/daisy/DaisyAdapter.py
new file mode 100644 (file)
index 0000000..9b06f4c
--- /dev/null
+++ b/modules/opnfv/installer_adapters/daisy/DaisyAdapter.py
@@ -0,0 +1,32 @@
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# Author: Jose Lausuch (jose.lausuch@ericsson.com)
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+
+class DaisyAdapter:
+
+    def __init__(self, installer_ip):
+        self.installer_ip = installer_ip
+
+    def get_deployment_info(self):
+        pass
+
+    def get_nodes(self):
+        pass
+
+    def get_controller_ips(self):
+        pass
+
+    def get_compute_ips(self):
+        pass
+
+    def get_file_from_installer(self, origin, target, options=None):
+        pass
+
+    def get_file_from_controller(self, origin, target, ip=None, options=None):
+        pass

diff --git a/modules/opnfv/installer_adapters/daisy/__init__.py b/modules/opnfv/installer_adapters/daisy/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules/opnfv/utils/Credentials.py b/modules/opnfv/utils/Credentials.py
index 1882692..6441b84 100644 (file)
--- a/modules/opnfv/utils/Credentials.py
+++ b/modules/opnfv/utils/Credentials.py
@@ -47,7 +47,7 @@ class Credentials(object):
                                                     password)
 
     def __check_installer_name(self, installer):
-        if installer not in ("apex", "compass", "fuel", "joid"):
+        if installer not in ("apex", "compass", "daisy", "fuel", "joid"):
             return os.EX_CONFIG
         else:
             return os.EX_OK
@@ -69,6 +69,10 @@ class Credentials(object):
         # TODO
         pass
 
+    def __fetch_creds_daisy(self, target_path):
+        # TODO
+        pass
+
     def __fetch_creds_fuel(self, target_path):
         creds_file = '/root/openrc'
         try:
@@ -95,6 +99,8 @@ class Credentials(object):
             self.__fetch_creds_apex(target_path)
         elif self.installer == "compass":
             self.__fetch_creds_compass(target_path)
+        elif self.installer == "daisy":
+            self.__fetch_creds_daisy(target_path)
         elif self.installer == "fuel":
             self.__fetch_creds_fuel(target_path)
         elif self.installer == "joid":

diff --git a/modules/opnfv/utils/constants.py b/modules/opnfv/utils/constants.py
index 29f0d02..a69cedd 100644 (file)
--- a/modules/opnfv/utils/constants.py
+++ b/modules/opnfv/utils/constants.py
@@ -7,7 +7,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
-INSTALLERS = ['apex', 'fuel', 'compass', 'joid']
+INSTALLERS = ['apex', 'fuel', 'compass', 'joid', "daisy"]
 VERSIONS = ['arno', 'brahmaputra', 'colorado', 'danube']
 
 EXIT_OK = 0

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index ecc571d..3667dbe 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -104,18 +104,13 @@ if [ "$installer_type" == "fuel" ]; then
     #This file contains the mgmt keystone API, we need the public one for our rc file
     admin_ip=$(cat $dest_path | grep "OS_AUTH_URL" | sed 's/^.*\=//' | sed "s/^\([\"']\)\(.*\)\1\$/\2/g" | sed s'/\/$//')
     public_ip=$(sshpass -p r00tme ssh $ssh_options root@${installer_ip} \
-        "ssh ${controller_ip} 'source openrc; openstack endpoint list --long'" \
-        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null
+        "ssh ${controller_ip} 'source openrc; openstack endpoint list'" \
+        | grep keystone | grep public | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null
         #| grep http | head -1 | cut -d '|' -f 4 | sed 's/v1\/.*/v1\//' | sed 's/ //g') &> /dev/null
     #NOTE: this is super ugly sed 's/v1\/.*/v1\//'OS_AUTH_URL
     # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s
     # Fuel virtual need a fix
 
-    if [ "$DEPLOY_TYPE" == "virt" ]; then
-        echo "INFO: Changing: internalURL -> publicURL in openrc"
-        sed -i 's/internalURL/publicURL/' $dest_path
-    fi
-
 elif [ "$installer_type" == "apex" ]; then
     verify_connectivity $installer_ip
 
@@ -196,13 +191,6 @@ if [ ! -f $dest_path ]; then
     error "There has been an error retrieving the credentials"
 fi
 
-if [ "$public_ip" != "" ]; then
-    info "Exchanging keystone public IP in rc file to $public_ip"
-    sed -i  "/OS_AUTH_URL/c\export OS_AUTH_URL=\'$public_ip'" $dest_path
-fi
-
-
-
 echo "-------- Credentials: --------"
 cat $dest_path
 

diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh
index 9751a90..be9fe18 100755 (executable)
--- a/utils/jenkins-jnlp-connect.sh
+++ b/utils/jenkins-jnlp-connect.sh
@@ -95,18 +95,30 @@ main () {
         makemonit () {
             echo "Writing the following as monit config:"
         cat << EOF | tee $monitconfdir/jenkins
+check directory jenkins_piddir path /var/run/$jenkinsuser
+if does not exist then exec "/usr/bin/mkdir -p /var/run/$jenkinsuser"
+if failed uid $jenkinsuser then exec "/usr/bin/chown $jenkinsuser /var/run/$jenkinsuser"
+if failed gid $jenkinsuser then exec "/usr/bin/chown :$jenkinsuser /var/run/$jenkinsuser"
+
 check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid
 start program = "/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $jenkinshome; export started_monit=true; $0 $@' with timeout 60 seconds"
 stop program = "/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'"
+depends on jenkins_piddir
 EOF
         }
 
         if [[ -f $monitconfdir/jenkins ]]; then
             #test for diff
             if [[ "$(diff $monitconfdir/jenkins <(echo "\
+check directory jenkins_piddir path /var/run/$jenkinsuser
+if does not exist then exec \"/usr/bin/mkdir -p /var/run/$jenkinsuser\"
+if failed uid $jenkinsuser then exec \"/usr/bin/chown $jenkinsuser /var/run/$jenkinsuser\"
+if failed gid $jenkinsuser then exec \"/usr/bin/chown :$jenkinsuser /var/run/$jenkinsuser\"
+
 check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid
 start program = \"/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $jenkinshome; export started_monit=true; $0 $@' with timeout 60 seconds\"
-stop program = \"/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\
+stop program = \"/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"
+depends on jenkins_piddir\
 ") )" ]]; then
                 echo "Updating monit config..."
                 makemonit $@

diff --git a/utils/test/reporting/functest/template/index-status-tmpl.html b/utils/test/reporting/functest/template/index-status-tmpl.html
index 094bbf8..52046c3 100644 (file)
--- a/utils/test/reporting/functest/template/index-status-tmpl.html
+++ b/utils/test/reporting/functest/template/index-status-tmpl.html
@@ -72,6 +72,7 @@ $(document).ready(function (){
             <li class="active"><a href="../../index.html">Home</a></li>
             <li><a href="status-apex.html">Apex</a></li>
             <li><a href="status-compass.html">Compass</a></li>
+            <li><a href="status-daisy.html">Daisy</a></li>
             <li><a href="status-fuel.html">Fuel</a></li>
             <li><a href="status-joid.html">Joid</a></li>
           </ul>

diff --git a/utils/test/reporting/functest/template/index-tempest-tmpl.html b/utils/test/reporting/functest/template/index-tempest-tmpl.html
index db48307..3a22227 100644 (file)
--- a/utils/test/reporting/functest/template/index-tempest-tmpl.html
+++ b/utils/test/reporting/functest/template/index-tempest-tmpl.html
@@ -24,6 +24,7 @@
             <li class="active"><a href="../../index.html">Home</a></li>
             <li><a href="tempest-apex.html">Apex</a></li>
             <li><a href="tempest-compass.html">Compass</a></li>
+            <li><a href="tempest-daisy.html">Daisy</a></li>
             <li><a href="tempest-fuel.html">Fuel</a></li>
             <li><a href="tempest-joid.html">Joid</a></li>
           </ul>

diff --git a/utils/test/reporting/functest/template/index-vims-tmpl.html b/utils/test/reporting/functest/template/index-vims-tmpl.html
index 033c8ab..cd51607 100644 (file)
--- a/utils/test/reporting/functest/template/index-vims-tmpl.html
+++ b/utils/test/reporting/functest/template/index-vims-tmpl.html
@@ -24,6 +24,7 @@
             <li class="active"><a href="../../index.html">Home</a></li>
             <li><a href="vims-fuel.html">Fuel</a></li>
             <li><a href="vims-compass.html">Compass</a></li>
+            <li><a href="vims-daisy.html">Daisy</a></li>
             <li><a href="vims-joid.html">JOID</a></li>
             <li><a href="vims-apex.html">APEX</a></li>
           </ul>

diff --git a/utils/test/reporting/reporting.yaml b/utils/test/reporting/reporting.yaml
index 447d6e1..fa98626 100644 (file)
--- a/utils/test/reporting/reporting.yaml
+++ b/utils/test/reporting/reporting.yaml
@@ -4,6 +4,7 @@ general:
         - compass
         - fuel
         - joid
+        - daisy
 
     versions:
         - master