From c12185af79960d788fc59ee72d517920ab178322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 9 Feb 2021 20:46:14 +0100 Subject: [PATCH] Refactor docker testing script --- test-in-docker.sh | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/test-in-docker.sh b/test-in-docker.sh index 1fe9f27..6007b5a 100755 --- a/test-in-docker.sh +++ b/test-in-docker.sh @@ -4,7 +4,6 @@ set -o nounset set -o errexit tmpdir="$(mktemp -d)" -tmpdir=/tmp/dotfiles git archive --format tar --output "${tmpdir}/dotfiles.tar" HEAD @@ -17,24 +16,29 @@ git submodule foreach 'bash -x -c " gzip -k -f -v "${tmpdir}/dotfiles.tar" -exit 1 +test_ares() { + docker pull docker.io/library/archlinux:base + docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname ares docker.io/library/archlinux:base sh -c ' + set -o errexit -docker pull docker.io/library/archlinux:base -docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname ares docker.io/library/archlinux:base sh -c '" - set -o errexit + pacman -Syu --noconfirm python3 + cd $(mktemp -d) + tar xf /tmp/dotfiles.tar.gz -C . + ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh + read -p "Done, [return] to continue " + ' +} - pacman -Syu --noconfirm python3 - cd $(mktemp -d) - tar xf /tmp/dotfiles.tar.gz -C . - ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh - read -p "Done, [return] to continue " -' +test_tb_hak() { + docker pull docker.io/library/ubuntu:18.04 + docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname tb-hak docker.io/library/ubuntu:18.04 sh -c ' + set -o errexit -docker pull docker.io/library/ubuntu:18.04 -docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname tb-hak docker.io/library/ubuntu:18.04 sh -c ' - set -o errexit + cd $(mktemp -d) + tar xf /tmp/dotfiles.tar.gz -C . + ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh + ' +} - cd $(mktemp -d) - tar xf /tmp/dotfiles.tar.gz -C . - ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh -' +test_ares +test_tb_hak