summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpyros Trigazis <strigazi@gmail.com>2017-02-24 12:46:42 -0500
committerSpyros Trigazis <strigazi@gmail.com>2017-02-24 12:46:42 -0500
commit07480298c29b89ced64f367f4853f9b27f3554cf (patch)
treeff99b28b181e90b8b64f4b1020caf64116a46c01
parent0c7625ff4b7eb27f2ece751fa0475d4babd6d824 (diff)
Fix mesos gate
Use DEVSTACK_LOCAL_CONFIG istead of localrc to pass MAGNUM_IMAGE_URL. Change-Id: I5b18ff84b532483c166fc92bf4c84e4e7dbd23bb
Notes
Notes (review): Code-Review+2: yatin <yatin.karel@nectechnologies.in> Workflow+1: yatin <yatin.karel@nectechnologies.in> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 25 Feb 2017 06:24:44 +0000 Reviewed-on: https://review.openstack.org/438019 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 36c9e1a..8ac2d5c 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -34,9 +34,9 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector" 34export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
35 35
36if [ "$coe" = "mesos" ]; then 36if [ "$coe" = "mesos" ]; then
37 echo "MAGNUM_GUEST_IMAGE_URL=https://tarballs.openstack.org/magnum/images/ubuntu-mesos.qcow2" >> $BASE/new/devstack/localrc 37 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://tarballs.openstack.org/magnum/images/ubuntu-mesos.qcow2"
38elif [ "$coe" = "k8s-coreos" ]; then 38elif [ "$coe" = "k8s-coreos" ]; then
39 echo "MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2" >> $BASE/new/devstack/localrc 39 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2"
40elif [ "${coe}${special}" = "k8s-ironic" ]; then 40elif [ "${coe}${special}" = "k8s-ironic" ]; then
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz'" 41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz'"
42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'" 42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'"