openstack
/
openstack-ansible-tests
Code Issues Proposed changes

Revert Trusty CI test bypass 

With https://review.openstack.org/431501 merged the Trusty
jobs should no longer be running on master or stable/ocata
so this test bypass is no longer required.

Reverts:
https://review.openstack.org/431538
https://review.openstack.org/431633

Change-Id: I486280ad4e57abb5366f707e12509d1b0481a17c
This commit is contained in:
Jesse Pretorius 2017-02-18 09:37:41 +00:00
parent 1e63e888a9
commit 515bfab6be
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test-ansible-functional.sh
View File

@ -78,16 +78,6 @@ function gate_job_exit_tasks {
## Main ----------------------------------------------------------------------
# Workaround for bad CI jobs which are executing Trusty when they should not
# When Trusty is detected, just exit with a successful result immediately
source /etc/os-release 2>/dev/null
export DISTRO_ID="${ID}"
export DISTRO_VERSION_ID="${VERSION_ID}"
if [[ "${ROLE_NAME}" != "openstack-ansible-security" ]] && [[ "${DISTRO_ID}" == 'ubuntu' ]] && [[ "${DISTRO_VERSION_ID}" == '14.04' ]]; then
echo "Ubuntu Trusty detected. Exiting without running the job."
exit 0
fi
# Ensure that the Ansible environment is properly prepared
source "${COMMON_TESTS_PATH}/test-ansible-env-prep.sh"