diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-07-30 17:28:16 +0000 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2018-08-10 09:16:13 +0000 |
| commit | 325bf96ce5fc13780fab0731855a2e2092208a2b (patch) | |
| tree | 16c8c679c890dc7e0f18ec63a7a3f6c39cbec4cd /resources/libraries | |
| parent | 8f5f344d59674ea4c158e8ff1528716276f5b071 (diff) | |
CSIT-1193 De-duplicate bootstrap scripts into one
- DPDK and VPP bootstrap merged into one (ligato will follow).
- Added more error detections
- Added topo-cleanup.py to cleanup TB before and after test.
- Remove installation of VPP
Change-Id: I7a86117eb03cbe4ee8fde47baeed58bc86c0dfb2
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/ContainerUtils.py | 9 | ||||
| -rw-r--r-- | resources/libraries/python/SetupFramework.py | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 9a141767b9..eadc0a8a5a 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -329,12 +329,15 @@ class ContainerEngine(object): if self.container.install_dkms: self.execute( 'apt-get install -y dkms && ' - 'dpkg -i --force-all {guest_dir}/install_dir/*.deb'. + 'dpkg -i --force-all ' + '{guest_dir}/openvpp-testing/download_dir/*.deb'. format(guest_dir=self.container.mnt[0].split(':')[1])) else: self.execute( - 'for i in $(ls -I \"*dkms*\" {guest_dir}/install_dir/); do ' - 'dpkg -i --force-all {guest_dir}/install_dir/$i; done'. + 'for i in $(ls -I \"*dkms*\" ' + '{guest_dir}/openvpp-testing/download_dir/); do ' + 'dpkg -i --force-all ' + '{guest_dir}/openvpp-testing/download_dir/$i; done'. format(guest_dir=self.container.mnt[0].split(':')[1])) self.execute('apt-get -f install -y') self.execute('apt-get install -y ca-certificates') diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index 558d5d4097..46b8597e87 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -56,7 +56,7 @@ def pack_framework_dir(): proc = Popen( split("tar --sparse --exclude-vcs --exclude=output*.xml " - "--exclude=./tmp --exclude=*.deb --exclude=*.rpm -zcf {0} ." + "--exclude=./tmp -zcf {0} ." .format(file_name)), stdout=PIPE, stderr=PIPE) (stdout, stderr) = proc.communicate() |