Skip to content
Browse files

fix test failures

this commit is aimed at fixing gating test failures:

- add conditional statement so that openstack_dev_env can be tested
- fix dep failure

Change-Id: I29290fd448f39729d319412df470ff0eb6246333
  • Loading branch information...
1 parent 23af79e commit f425f8d96b6d29f39af8b4e5b6d8117230318eda @bodepd bodepd committed Apr 26, 2013
Showing with 7 additions and 3 deletions.
  1. +1 −1 manifests/setup/precise64.pp
  2. +6 −2 test_scripts/openstack_test.sh
View
2 manifests/setup/precise64.pp
@@ -28,7 +28,7 @@
exec { '/usr/bin/apt-get update':
require => Class['apt'],
refreshonly => true,
- subscribe => [Class['apt'], Apt::Source["openstack_folsom"]],
+ subscribe => [Class['apt'], Apt::Source["openstack_cloud_archive"]],
logoutput => true,
}
View
8 test_scripts/openstack_test.sh
@@ -40,11 +40,15 @@ elif [ $module_install_method = 'pmt' ]; then
fi
if [ -n "${module_repo:-}" ]; then
- pushd $module_repo
+ if [ ! "${module_repo:-}" = 'openstack_dev_env' ]; then
+ pushd $module_repo
+ fi
if [ -n "${checkout_branch_command:-}" ]; then
eval $checkout_branch_command
fi
- popd
+ if [ ! "${module_repo:-}" = 'openstack_dev_env' ]; then
+ popd
+ fi
fi

0 comments on commit f425f8d

Please sign in to comment.
Something went wrong with that request. Please try again.