From f915b1981feef2146924a9556285993bc08dfcbe Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 2 Aug 2021 16:57:59 +0300 Subject: test/integration/docker: remove output directory --- .github/workflows/ci.yml | 2 +- test/integration/docker/client/.gitignore | 1 + test/integration/docker/client/output/.gitignore | 1 - test/integration/docker/test.sh | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 test/integration/docker/client/.gitignore delete mode 100644 test/integration/docker/client/output/.gitignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b95f9f..7416e5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Integration test (Docker) - run: ./test/integration/docker/test.sh + run: sudo ./test/integration/docker/test.sh publish_docker: needs: [test_local, test_example_config, test_docker] diff --git a/test/integration/docker/client/.gitignore b/test/integration/docker/client/.gitignore new file mode 100644 index 0000000..ea1472e --- /dev/null +++ b/test/integration/docker/client/.gitignore @@ -0,0 +1 @@ +output/ diff --git a/test/integration/docker/client/output/.gitignore b/test/integration/docker/client/output/.gitignore deleted file mode 100644 index 355164c..0000000 --- a/test/integration/docker/client/output/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/ diff --git a/test/integration/docker/test.sh b/test/integration/docker/test.sh index 7948be0..58ccaca 100755 --- a/test/integration/docker/test.sh +++ b/test/integration/docker/test.sh @@ -10,6 +10,7 @@ readonly script_name readonly ssh_dir="$script_dir/ssh" readonly client_key_password='password' +readonly output_dir="$script_dir/client/output" dump() { local prefix="${FUNCNAME[0]}" @@ -29,6 +30,7 @@ cleanup() { remove_ssh_keys kill_ssh_agent + rm -rf -- "$output_dir" } generate_ssh_keys() { -- cgit v1.2.3