diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-06-03 19:52:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-06-03 19:52:57 +0000 |
| commit | bee2070d4a089ed9badba8d2ecd95a7ea82d3085 (patch) | |
| tree | 889d3f1ab65b1cf9799a3353eb5ad4733498ac7f /docker/scripts | |
| parent | dfc3471ba2fc8c0f68668b18d8968959c4a8c46d (diff) | |
| parent | 08c4bd59672f308b3a871e063e103909040df394 (diff) | |
Merge "JJB: Include perf analysis per job"
Diffstat (limited to 'docker/scripts')
| -rwxr-xr-x | docker/scripts/dbld_lfit_requirements.sh | 5 | ||||
| -rw-r--r-- | docker/scripts/lib_apt.sh | 1 | ||||
| -rw-r--r-- | docker/scripts/lib_dnf.sh | 1 | ||||
| -rw-r--r-- | docker/scripts/lib_yum.sh | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh index 7067d9929..278b78ede 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 725aedcca..099a85a68 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 45204210e..c60621698 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 27c297a1c..fe0bc5355 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 \\ |