summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-04-23 13:12:24 +0000
committerDave Wallace <dwallacelf@gmail.com>2021-06-03 14:27:54 -0400
commit08c4bd59672f308b3a871e063e103909040df394 (patch)
tree44551c7f6bc3a71d5d7e7fc2855fc863ccdb621d /docker
parent90da6a2780f9a9e73321b5784b3d5eb3928bca31 (diff)
JJB: Include perf analysis per job
+ Useful for performance analysis before run. This should help to analyze machine load before starting payload by comparing conditions from running jobs. - Requirements: sysstat (apt install sysstat) - Remove extraneous python import from backup_upload_archives.sh - Fix sar issue on centos-7 - Fix debian9 lftools install / upgrade issue Signed-off-by: pmikus <pmikus@cisco.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I6b61f99b9b2cde2bac3dacdefaa926e9afbb157e
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/scripts/dbld_lfit_requirements.sh5
-rw-r--r--docker/scripts/lib_apt.sh1
-rw-r--r--docker/scripts/lib_dnf.sh1
-rw-r--r--docker/scripts/lib_yum.sh1
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh
index 7067d992..278b78ed 100755
--- a/docker/scripts/dbld_lfit_requirements.sh
+++ b/docker/scripts/dbld_lfit_requirements.sh
@@ -54,5 +54,10 @@ OLD_PATH="$PATH"
python3 -m venv "$LF_VENV"
PATH="$LF_VENV/bin:$PATH"
python3 -m pip install --upgrade pip
+# on Debian-9 lftools needs to be installed before it is upgraded
+# in order to get the latest version.
+if [ "$OS_ID" = "debian" ] && [ "$OS_VERSION_ID" = "9" ] ; then
+ python3 -m pip install lftools
+fi
python3 -m pip install --upgrade --upgrade-strategy eager lftools
PATH="$OLD_PATH"
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 725aedcc..099a85a6 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -178,6 +178,7 @@ RUN apt-get update -qq \\
ruby-dev \\
software-properties-common \\
sshpass \\
+ sysstat \\
sudo \\
texlive-fonts-extra \\
texlive-fonts-recommended \\
diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh
index 45204210..c6062169 100644
--- a/docker/scripts/lib_dnf.sh
+++ b/docker/scripts/lib_dnf.sh
@@ -126,6 +126,7 @@ RUN dnf install -y \\
rsync \\
ruby-devel \\
sshpass \\
+ sysstat \\
sudo \\
tree \\
unzip \\
diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh
index 27c297a1..fe0bc535 100644
--- a/docker/scripts/lib_yum.sh
+++ b/docker/scripts/lib_yum.sh
@@ -120,6 +120,7 @@ RUN yum install -y \\
rake \\
ruby-devel \\
sshpass \\
+ sysstat \\
sudo \\
tree \\
unzip \\