include the mutiple Ubuntu distro and architecture

for mitaka we can enable trusty and xenial and wip to include
arm64 and power8 architecture as well.

Change-Id: I7624367fcb6464d9619097775448b9b768a73025
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 1494477..6cd2ee3 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -142,9 +142,9 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
 ##
 
 echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME"
+echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO"
 
-./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME
+./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO
 exit_on_error $? "Main deploy FAILED"
 
 ##

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 57ca986..c0223e2 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -85,3 +85,11 @@
             name: MAAS_REINSTALL
             default: 'false'
             description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
+        - string:
+            name: UBUNTU_DISTRO
+            default: 'trusty'
+            description: "Ubuntu distribution to use for Openstack (trusty|xenial)"
+        - string:
+            name: CPU_ARCHITECTURE
+            default: 'amd64'
+            description: "CPU Architecture to use for Ubuntu distro "