diff options
| -rw-r--r-- | jjb/vpp/include-raw-vpp-packagecloud-push.sh | 15 | ||||
| -rw-r--r-- | packer/provision/basebuild.sh | 5 |
2 files changed, 6 insertions, 14 deletions
diff --git a/jjb/vpp/include-raw-vpp-packagecloud-push.sh b/jjb/vpp/include-raw-vpp-packagecloud-push.sh index 74b96b382..8908d09c5 100644 --- a/jjb/vpp/include-raw-vpp-packagecloud-push.sh +++ b/jjb/vpp/include-raw-vpp-packagecloud-push.sh @@ -2,23 +2,14 @@ if [ "${OS}" == "ubuntu1404" ]; then DEBS=$(find . -type f -iname '*.deb') - for i in $DEBS - do - package_cloud push fdio/test/ubuntu/trusty/main "$i" - done + package_cloud push fdio/test/ubuntu/trusty/main ${DEBS} elif [ "${OS}" == "ubuntu1604" ]; then DEBS=$(find . -type f -iname '*.deb') - for i in $DEBS - do - package_cloud push fdio/test/ubuntu/xenial/main "$i" - done + package_cloud push fdio/test/ubuntu/xenial/main ${DEBS} elif [ "${OS}" == "centos7" ]; then # Find the files RPMS=$(find . -type f -iname '*.rpm') SRPMS=$(find . -type f -iname '*.srpm') SRCRPMS=$(find . -type f -name '*.src.rpm') - for i in $RPMS $SRPMS $SRCRPMS - do - package_cloud push fdio/test/el/7/os/x86_64/ "$i" - done + package_cloud push fdio/test/el/7/os/x86_64/ ${RPMS} ${SRPMS} ${SRCRPMS} fi
\ No newline at end of file diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 1ffa6034f..88d208d34 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -111,8 +111,9 @@ ubuntu_systems() { # DEB Install Python dependencies echo "---> Installing Python dependencies $(date +'%Y%m%dT%H%M%S')" - PYTHON_PKGS="python-dev python-virtualenv python-setuptools python-pip \ - libssl-dev libmysqlclient-dev python2.7 libffi-dev python-cffi" + PYTHON_PKGS="python-all python-dev python-virtualenv python-setuptools \ + python-pip libssl-dev libmysqlclient-dev python2.7 libffi-dev \ + python-cffi" apt install -y ${PYTHON_PKGS} # Memory leakage checks |