From f966a79b232a79122a066201193ffafb939b7ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 18 Nov 2019 15:56:47 -0300 Subject: [PATCH] fix(travis): remove extra_packages duplicated entries --- .travis.yml | 16 ++++++++-------- Dockerfile.zyp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cb9c66..d3aab25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,16 +66,16 @@ env: # but they ship with Python3 since 29, so we install it using git # https://bugzilla.redhat.com/show_bug.cgi?id=1723207 # except for 2017.7, which does not run on python3 - - DN=fedora DV=31 PI=dnf SV=master SIM=git PV=3 EP="openssh-server openssh-clients which findutils glibc-langpack-en python3-pip" - - DN=fedora DV=31 PI=dnf SV=2019.2 SIM=git PV=3 EP="openssh-server openssh-clients which findutils glibc-langpack-en python3-pip" - - DN=fedora DV=30 PI=dnf SV=2018.3 SIM=git PV=3 EP="openssh-server openssh-clients which findutils glibc-langpack-en python3-pip" - - DN=fedora DV=30 PI=dnf SV=2017.7 SIM=git PV=2 EP="openssh-server openssh-clients which findutils glibc-langpack-en python-pip" + - DN=fedora DV=31 PI=dnf SV=master SIM=git PV=3 EP="python3-pip" + - DN=fedora DV=31 PI=dnf SV=2019.2 SIM=git PV=3 EP="python3-pip" + - DN=fedora DV=30 PI=dnf SV=2018.3 SIM=git PV=3 EP="python3-pip" + - DN=fedora DV=30 PI=dnf SV=2017.7 SIM=git PV=2 EP="python-pip" # OPENSUSE - - DN=opensuse/leap DV=15.1 PI=zyp SV=master SIM=git PV=3 EP="glibc-locale net-tools openssh which net-tools-deprecated python-xml python3-pip" - - DN=opensuse/leap DV=15.1 PI=zyp SV=2019.2 SIM=git PV=3 EP="glibc-locale net-tools openssh which net-tools-deprecated python-xml python3-pip" - - DN=opensuse/leap DV=15.1 PI=zyp SV=2018.3 SIM=git PV=2 EP="glibc-locale net-tools openssh which net-tools-deprecated python-xml python-pip" - - DN=opensuse/leap DV=15.1 PI=zyp SV=2017.7 SIM=git PV=2 EP="glibc-locale net-tools openssh which net-tools-deprecated python-xml python-pip" + - DN=opensuse/leap DV=15.1 PI=zyp SV=master SIM=git PV=3 EP="python3-pip" + - DN=opensuse/leap DV=15.1 PI=zyp SV=2019.2 SIM=git PV=3 EP="python3-pip" + - DN=opensuse/leap DV=15.1 PI=zyp SV=2018.3 SIM=git PV=2 EP="python-pip" + - DN=opensuse/leap DV=15.1 PI=zyp SV=2017.7 SIM=git PV=2 EP="python-pip" # UBUNTU - DN=ubuntu DV=18.04 PI=apt SV=master SIM=git PV=3 EP="python3-pip" diff --git a/Dockerfile.zyp b/Dockerfile.zyp index 0034bb5..3f97ede 100644 --- a/Dockerfile.zyp +++ b/Dockerfile.zyp @@ -9,7 +9,7 @@ ARG SALT_VERSION ARG PYTHON_VERSION ARG EXTRA_PACKAGES="" -ARG PKGS="udev git net-tools sudo curl $EXTRA_PACKAGES" +ARG PKGS="udev git net-tools net-tools-deprecated sudo curl glibc-locale openssh which python-xml $EXTRA_PACKAGES" RUN zypper refresh && zypper install -y ${PKGS}