From da9847777053f26b190b12f3435ebdd258c1b8cd Mon Sep 17 00:00:00 2001 From: gggeek Date: Thu, 24 Nov 2022 17:22:27 +0000 Subject: [PATCH] make test env setup scripts more verbose --- tests/ci/setup/create_user.sh | 4 ++++ tests/ci/setup/install_packages.sh | 4 ++++ tests/ci/setup/setup_apache.sh | 4 ++++ tests/ci/setup/setup_composer.sh | 4 ++++ tests/ci/setup/setup_perl.sh | 4 ++++ tests/ci/setup/setup_privoxy.sh | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/tests/ci/setup/create_user.sh b/tests/ci/setup/create_user.sh index 33553d2e..3c681384 100755 --- a/tests/ci/setup/create_user.sh +++ b/tests/ci/setup/create_user.sh @@ -4,6 +4,8 @@ set -e +echo "Creating user account..." + USERNAME="${1:-docker}" addgroup --gid 2000 "${USERNAME}" @@ -19,3 +21,5 @@ if [ -f /etc/sudoers ]; then adduser "${USERNAME}" sudo sed -i "\$ a ${USERNAME} ALL=\(ALL:ALL\) NOPASSWD: ALL" /etc/sudoers fi + +echo "Done creating user account" diff --git a/tests/ci/setup/install_packages.sh b/tests/ci/setup/install_packages.sh index 5ebcac00..21db28e5 100755 --- a/tests/ci/setup/install_packages.sh +++ b/tests/ci/setup/install_packages.sh @@ -4,5 +4,9 @@ set -e +echo "Installing base software packages..." + DEBIAN_FRONTEND=noninteractive apt-get install -y \ lsb-release sudo unzip wget + +echo "Done installing base software packages" diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh index 1e012e0a..9a32520b 100755 --- a/tests/ci/setup/setup_apache.sh +++ b/tests/ci/setup/setup_apache.sh @@ -4,6 +4,8 @@ # Has to be run as admin # @todo make this work across all ubuntu versions (precise to jammy) +echo "Installing and configuring Apache2..." + set -e SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")" @@ -36,3 +38,5 @@ fi echo "export HTTPSERVER=localhost" >> /etc/apache2/envvars service apache2 restart + +echo "Done Installing and configuring Apache2" diff --git a/tests/ci/setup/setup_composer.sh b/tests/ci/setup/setup_composer.sh index cd2f81ce..83939f9b 100755 --- a/tests/ci/setup/setup_composer.sh +++ b/tests/ci/setup/setup_composer.sh @@ -3,6 +3,8 @@ # Installs Composer (latest version, to avoid relying on old ones bundled with the OS) # @todo allow users to lock down to Composer v1 if needed +echo "Installing Composer..." + if dpkg -l composer 2>/dev/null; then apt-get remove -y composer fi @@ -30,4 +32,6 @@ if [ -f /usr/local/bin/composer.phar -a "$RESULT" = 0 ]; then mv /usr/local/bin/composer.phar /usr/local/bin/composer && chmod 755 /usr/local/bin/composer fi +echo "Done installing Composer" + exit $RESULT diff --git a/tests/ci/setup/setup_perl.sh b/tests/ci/setup/setup_perl.sh index 102f6774..a85cecb3 100644 --- a/tests/ci/setup/setup_perl.sh +++ b/tests/ci/setup/setup_perl.sh @@ -8,8 +8,12 @@ set -e +echo "Installing Perl..." + DEBIAN_FRONTEND=noninteractive apt-get install -y \ libexpat1-dev yes | perl -MCPAN -e 'install XML::Parser' yes | perl -MCPAN -e 'install Frontier::Client' + +echo "Done installing Perl" diff --git a/tests/ci/setup/setup_privoxy.sh b/tests/ci/setup/setup_privoxy.sh index c39e62f0..4d31e33e 100755 --- a/tests/ci/setup/setup_privoxy.sh +++ b/tests/ci/setup/setup_privoxy.sh @@ -5,9 +5,13 @@ set -e +echo "Installing privoxy..." + SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" DEBIAN_FRONTEND=noninteractive apt-get install -y privoxy cp -f "$SCRIPT_DIR/../config/privoxy" /etc/privoxy/config service privoxy restart + +echo "Done installing Privoxy" -- 2.47.0