openstack/puppet-openstack-integration
Code Issues Proposed changes

Don't pin Tempest if jobs are run in Tempest gate

Browse Source 
Do not pin Tempest if the jobs are run in Tempest gate, so they can
actually see the errors we have without the pin.

Change-Id: I439dc6b8200a59f31c0227a124b4a2a6e8d443ba
This commit is contained in:
Emilien Macchi 2016-12-19 15:11:34 -05:00
parent f43dfbd91d
commit dafc82ccfb
1 changed files with 10 additions and 8 deletions

18
run_tests.sh

@ -24,7 +24,7 @@ export HIERA_CONFIG=${HIERA_CONFIG:-${SCRIPT_DIR}/hiera/hiera.yaml}
export MANAGE_HIERA=${MANAGE_HIERA:-true} export MANAGE_HIERA=${MANAGE_HIERA:-true}
export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --trace --hiera_config ${HIERA_CONFIG} --logdest ${WORKSPACE}/puppet.log" export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --trace --hiera_config ${HIERA_CONFIG} --logdest ${WORKSPACE}/puppet.log"
export DISTRO=$(lsb_release -c -s) export DISTRO=$(lsb_release -c -s)
export TEMPEST_VERSION=${TEMPEST_VERSION:-'origin/master'} export TEMPEST_VERSION=${TEMPEST_VERSION:-'382a2065f3364a36c110bfcc6275a0f8f6894773'}
# NOTE(pabelanger): Setup facter to know about AFS mirror. # NOTE(pabelanger): Setup facter to know about AFS mirror.
if [ -f /etc/nodepool/provider ]; then if [ -f /etc/nodepool/provider ]; then
@ -100,7 +100,15 @@ else
fi fi
pushd /tmp/openstack/tempest pushd /tmp/openstack/tempest
git reset --hard $TEMPEST_VERSION # we don't pin Tempest in Tempest gate, so we can actually run
# real tests in order to fix Tempest.
if [ "$ZUUL_PROJECT" != "openstack/tempest" ] && [ ! -z ${ZUUL_PROJECT+x} ]; then
# openstack/tempest/master interface breaks Trove and more services.
# There is an attempt to fix it here:
# https://review.openstack.org/#/c/412511/
# Let's pin Tempest until the fix works and is merged.
git reset --hard $TEMPEST_VERSION
fi
popd popd
# NOTE(pabelanger): We cache cirros images on our jenkins slaves, check if it # NOTE(pabelanger): We cache cirros images on our jenkins slaves, check if it
@ -244,12 +252,6 @@ fi
print_header 'Running Tempest' print_header 'Running Tempest'
cd /tmp/openstack/tempest cd /tmp/openstack/tempest
# openstack/tempest/master interface breaks Trove and more services.
# There is an attempt to fix it here:
# https://review.openstack.org/#/c/412511/
# Let's pin Tempest until the fix works and is merged.
git checkout 382a2065f3364a36c110bfcc6275a0f8f6894773
virtualenv --system-site-packages run_tempest virtualenv --system-site-packages run_tempest
run_tempest/bin/pip install -U . run_tempest/bin/pip install -U .
run_tempest/bin/tempest run --whitelist_file=/tmp/openstack/tempest/test-whitelist.txt --concurrency=2 $EXCLUDES run_tempest/bin/tempest run --whitelist_file=/tmp/openstack/tempest/test-whitelist.txt --concurrency=2 $EXCLUDES