Merge "add process of building PPA into daily job"

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 9e3ff51..2d57102 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -607,7 +607,22 @@
 
             # ODL
             echo "Functest: run ODL suite"
-            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+
+            if [ $INSTALLER_TYPE == "fuel" ]; then
+                odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+                neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+                usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
+                pass=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
+                odl_port=8181
+                ODL_PORT=$odl_port ODL_IP=$odl_ip NEUTRON_IP=$neutron_ip USR_NAME=$usr_name PASS=$pass \
+                $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+            elif [ $INSTALLER_TYPE == "foreman" ]; then
+                #odl_port=8081
+                $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+            else
+                echo "INSTALLER_TYPE not valid."
+                exit 1
+            fi
 
             # rally
             echo "Functest: run Functest Rally Bench suites"

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index a6cc36c..09ba8a3 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -25,9 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            disabled: false
 ########################
 # job templates
 ########################
@@ -195,7 +197,7 @@
 
     node: ericsson-build
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     triggers:
         - 'foreman-{stream}'
@@ -728,4 +730,4 @@
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - timed: '0 17 * * *'
+        - timed: '0 12 * * *'

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 7fa98b1..441cbe5 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -25,9 +25,11 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            disabled: false
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            disabled: true
 
 ########################
 # job templates
@@ -206,7 +208,7 @@
 
     node: ericsson-build
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     triggers:
         - 'fuel-{stream}'
@@ -276,7 +278,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameter:
+        - fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -793,7 +795,7 @@
 - trigger:
     name: 'fuel-master'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 5 * * *'
 
 - trigger:
     name: 'fuel-stable-arno'