Merge "jenkins: jobs: ansible-role-jobs: Always enable the EPEL repo"

This commit is contained in:
Jenkins 2017-07-11 06:25:17 +00:00 committed by Gerrit Code Review
commit 43e857a8b8
1 changed files with 6 additions and 10 deletions

View File

@ -77,20 +77,16 @@
template-name: "{template-name}" template-name: "{template-name}"
- zuul-git-prep-upper-constraints - zuul-git-prep-upper-constraints
- shell: | - shell: |
if [[ "{name}" == *"openstack-ansible"* ]]; then
# EPEL must be enabled because some deps from bindep.txt are # EPEL must be enabled because some deps from bindep.txt are
# otherwise not available # otherwise not available
if [[ -e /usr/bin/yum ]]; then if [[ -e /usr/bin/yum ]]; then
sudo yum-config-manager --enable epel sudo yum-config-manager --enable epel
fi fi
fi
- install-distro-packages - install-distro-packages
- shell: | - shell: |
if [[ "{name}" == *"openstack-ansible"* ]]; then
if [[ -e /usr/bin/yum ]]; then if [[ -e /usr/bin/yum ]]; then
sudo yum-config-manager --disable epel sudo yum-config-manager --disable epel
fi fi
fi
- shell: | - shell: |
# Allow Jenkins user to ssh into localhost # Allow Jenkins user to ssh into localhost
ssh-keygen -f ~/.ssh/id_rsa -N "" ssh-keygen -f ~/.ssh/id_rsa -N ""