summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh4
-rw-r--r--jjb/opnfv/installer-params.yml8
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml2
4 files changed, 12 insertions, 4 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 801de4a5b..991497a31 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -66,7 +66,7 @@
<<: *master
- zte-pod1:
installer: fuel
- disabled: false
+ disabled: true
<<: *master
- orange-pod2:
installer: joid
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 6b6cc9bbc..907db4f57 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -140,9 +140,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 57ca9864e..c0223e235 100644
--- 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 "
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 82b1a2367..e241cbeef 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -218,7 +218,7 @@
publishers:
- email:
- recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com
+ recipients: ana.cunha@ericsson.com
########################
# builder macros