Skip to content

Commit

Permalink
Merge pull request #31 from myii/feat/use-py3-for-centos-7
Browse files Browse the repository at this point in the history
feat(centos-7-py2): replace with `py3` due to Testinfra/InSpec failures
  • Loading branch information
javierbertoli authored Mar 12, 2020
2 parents 9144dcc + 2a418f5 commit dca36ad
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ env:
- DN=centos DV=8 PI=yum SIM=stable SV=3000 PV=3 EP="python3 python3-pip python3-devel openssl-devel swig glibc-langpack-en"
- DN=centos DV=8 PI=yum SIM=stable SV=2019.2 PV=3 EP="python3 python3-pip python3-devel openssl-devel swig glibc-langpack-en"
- DN=centos DV=7 PI=yum SIM=stable SV=2019.2 PV=3 EP="python3 python3-pip python3-devel openssl-devel swig gcc-g++ zeromq zeromq-devel"
- DN=centos DV=7 PI=yum SIM=stable SV=2019.2 PV=2 EP="python2-pip"
- DN=centos DV=7 PI=yum SIM=stable SV=2018.3 PV=2 EP="python2-pip"
- DN=centos DV=7 PI=yum SIM=stable SV=2018.3 PV=3 EP="python3 python3-pip python3-devel openssl-devel swig gcc-g++ zeromq zeromq-devel"
- DN=centos DV=6 PI=yum SIM=stable SV=2018.3 PV=2 EP="python27-pip"

# DEBIAN
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.zyp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ RUN if [ ! -e /etc/SuSE-release ]; then ln -s /etc/os-release /etc/SuSE-release;
RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION

# FIXME: Remove this temporary workaround when `repo.saltstack.com` is fixed
RUN sed -i -e 's:staging/::g' /etc/zypp/repos.d/systemsmanagement_saltstack_products.repo && zypper --gpg-auto-import-keys refresh

RUN rm -rf /var/cache/{salt,zyp} \
&& (find / -name "*pyc" ; find / -name "__pycache__") |grep -v /proc | xargs rm -rf

0 comments on commit dca36ad

Please sign in to comment.