From 8a65d0efd2512f8e137f5bfb45324e1132b17793 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 27 May 2020 13:22:07 +0200 Subject: repo-install-test: don't mount /data The "run-inside-docker.sh" script is running as root (in order to be able to install packages). Do not mount an outside directory as /data inside the image anymore, where the script would write temporary data. This causes problems on jenkins, as the temporary files are written as root and jenkins is then unable to wipe the workspace. I had used this for debugging when I wrote the script initially, but almost the same can be done now with INTERACTIVE=1 and cat on the temporary files. Related: OS#4563 Change-Id: If7e1d83580c2951e7e50181ba7e755b987675e4b --- scripts/repo-install-test/run-inside-docker.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/repo-install-test/run-inside-docker.sh') diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index a6eda13..e0f07c2 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -94,15 +94,15 @@ configure_keep_cache_centos() { echo "keepcache=1" >> /etc/dnf/dnf.conf } -# Filter /data/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in -# /data/osmocom_packages.txt. +# Filter $PWD/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in +# $PWD/osmocom_packages.txt. filter_packages_txt() { # Copy distro specific blacklist file, remove comments and sort it - grep -v "^#" /repo-install-test/blacklist_$DISTRO.txt | sort -u > /data/blacklist.txt + grep -v "^#" /repo-install-test/blacklist_$DISTRO.txt | sort -u > blacklist.txt # Generate list of pkgs to be installed from available pkgs minus the ones blacklisted - comm -23 /data/osmocom_packages_all.txt \ - /data/blacklist.txt > /data/osmocom_packages.txt + comm -23 osmocom_packages_all.txt \ + blacklist.txt > osmocom_packages.txt } install_repo_packages_debian() { @@ -112,10 +112,10 @@ install_repo_packages_debian() { # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html aptitude search -F%p \ "?origin($OBS) ?architecture(native)" | sort \ - > /data/osmocom_packages_all.txt + > osmocom_packages_all.txt filter_packages_txt - apt install -y $(cat /data/osmocom_packages.txt) + apt install -y $(cat osmocom_packages.txt) } install_repo_packages_centos() { @@ -127,10 +127,10 @@ install_repo_packages_centos() { --repoid="network_osmocom_$FEED" \ --archlist="x86_64,noarch" \ --qf="%{name}" \ - > /data/osmocom_packages_all.txt + > osmocom_packages_all.txt filter_packages_txt - dnf install -y $(cat /data/osmocom_packages.txt) + dnf install -y $(cat osmocom_packages.txt) } test_binaries_version() { -- cgit v1.2.3