From b74f0554b7a40f2481db8baf3c986516f522f127 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 9 Jan 2020 14:27:22 +0300 Subject: Travis: add docker tests --- .dockerignore | 8 +++ .travis.yml | 5 ++ .travis/.gitattributes | 1 + .travis/docker/client/etc/my_repos.py | 6 ++ .travis/docker/client/var/output/.gitignore | 1 + .travis/docker/docker-compose.yml | 16 +++++ .travis/docker/server/Dockerfile | 22 ++++++ .travis/docker/server/setup_repo.sh | 24 +++++++ .travis/docker/ssh/client_key | 54 ++++++++++++++ .travis/docker/ssh/client_key.pub | 1 + .travis/docker/ssh/server_key | 51 +++++++++++++ .travis/docker/ssh/server_key.pub | 1 + .travis/docker/test.sh | 107 ++++++++++++++++++++++++++++ .travis/local/test.sh | 6 +- 14 files changed, 300 insertions(+), 3 deletions(-) create mode 100644 .dockerignore create mode 100644 .travis/.gitattributes create mode 100644 .travis/docker/client/etc/my_repos.py create mode 100644 .travis/docker/client/var/output/.gitignore create mode 100644 .travis/docker/docker-compose.yml create mode 100644 .travis/docker/server/Dockerfile create mode 100755 .travis/docker/server/setup_repo.sh create mode 100644 .travis/docker/ssh/client_key create mode 100644 .travis/docker/ssh/client_key.pub create mode 100644 .travis/docker/ssh/server_key create mode 100644 .travis/docker/ssh/server_key.pub create mode 100755 .travis/docker/test.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b09db2c --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +**/.git +**/.gitattributes +**/.gitignore + +.dockerignore +**/Dockerfile + +.travis diff --git a/.travis.yml b/.travis.yml index ac4d7fc..635c87c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,8 @@ jobs: language: python python: '3.6' script: ./.travis/local/test.sh + - name: Test in Docker + language: minimal + services: + - docker + script: ./.travis/docker/test.sh diff --git a/.travis/.gitattributes b/.travis/.gitattributes new file mode 100644 index 0000000..dfdb8b7 --- /dev/null +++ b/.travis/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/.travis/docker/client/etc/my_repos.py b/.travis/docker/client/etc/my_repos.py new file mode 100644 index 0000000..2e1bc8b --- /dev/null +++ b/.travis/docker/client/etc/my_repos.py @@ -0,0 +1,6 @@ +from pull.repo import Repo + + +MY_REPOS = ( + Repo('test_repo', clone_url='root@server:~/test_repo'), +) diff --git a/.travis/docker/client/var/output/.gitignore b/.travis/docker/client/var/output/.gitignore new file mode 100644 index 0000000..355164c --- /dev/null +++ b/.travis/docker/client/var/output/.gitignore @@ -0,0 +1 @@ +*/ diff --git a/.travis/docker/docker-compose.yml b/.travis/docker/docker-compose.yml new file mode 100644 index 0000000..2b27bdd --- /dev/null +++ b/.travis/docker/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + server: + build: + context: . + dockerfile: server/Dockerfile + image: server + client: + build: + context: ../.. + dockerfile: Dockerfile + image: client + volumes: + - ./client/etc/:/etc/cgit-repos:ro + - "$SSH_AUTH_SOCK:/var/run/cgit-repos/ssh-agent.sock" + - ./client/var/output:/var/tmp/cgit-repos/output diff --git a/.travis/docker/server/Dockerfile b/.travis/docker/server/Dockerfile new file mode 100644 index 0000000..035d871 --- /dev/null +++ b/.travis/docker/server/Dockerfile @@ -0,0 +1,22 @@ +FROM alpine:3.11 + +RUN apk --no-cache add bash git openssh-server && \ + echo 'root:root' | chpasswd && \ + git config --global user.name 'Travis CI User' && \ + git config --global user.email 'travis@example.org' && \ + sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config + +WORKDIR /root + +COPY ["ssh/server_key", "/etc/ssh/ssh_host_rsa_key"] +COPY ["ssh/server_key.pub", "/etc/ssh/ssh_host_rsa_key.pub"] +COPY ["ssh/client_key.pub", "./.ssh/authorized_keys"] + +RUN chmod 0600 -- /etc/ssh/ssh_host_rsa_key && \ + chmod 0700 -- ./.ssh/ && \ + chmod 0600 -- ./.ssh/authorized_keys + +COPY ["server/setup_repo.sh", "./"] +RUN ./setup_repo.sh + +CMD ["/usr/sbin/sshd", "-D"] diff --git a/.travis/docker/server/setup_repo.sh b/.travis/docker/server/setup_repo.sh new file mode 100755 index 0000000..3d5b899 --- /dev/null +++ b/.travis/docker/server/setup_repo.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +readonly local_repo_path="$HOME/test_repo" + +setup_local_repo() { + mkdir -p -- "$local_repo_path" + pushd -- "$local_repo_path" > /dev/null + git init + echo '1' > 1.txt + git add . + git commit -m 'first commit' + echo '2' > 2.txt + git add . + git commit -m 'second commit' + popd > /dev/null +} + +main() { + setup_local_repo +} + +main diff --git a/.travis/docker/ssh/client_key b/.travis/docker/ssh/client_key new file mode 100644 index 0000000..3e15c7e --- /dev/null +++ b/.travis/docker/ssh/client_key @@ -0,0 +1,54 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-128-CBC,EFA2E15B12D68FC649086F06E013568D + +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 +-----END RSA PRIVATE KEY----- diff --git a/.travis/docker/ssh/client_key.pub b/.travis/docker/ssh/client_key.pub new file mode 100644 index 0000000..35dbd54 --- /dev/null +++ b/.travis/docker/ssh/client_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCju682tFYvigNZquMd9k89Z00YgSRl48Q9TevkweTKXmgp0P58rV+i1YypT7e2WWI7lOXs0QHxdXaU+aMplJqs4ek1SxzL7ySTYWDzUqPlbDKnd2zDEG0xF941w2t+DBTia+L5Bkc75z2ClYBDt49bXNFSixQhVM+HjZX/gHTknFtOSZGAwCQh/jw+Zdj+SBKaE2CVtKtLYtroKRNJH8K8EOQNpWY7e5/7r7I1bwtpCL6NWKNq38KmvacQqF4kfJ2oFW7HGj/k0DgQYcawh/WrV53IFzs6Ig2k7dPrGqFOFWcQZiFKYT7ndN6SNiu3yqIwjfHh5FLnFv+kOaCNHOy3f2Xebeb6ErwCMEbEK4k3KsWCceP8t0q8tzahw13tUgXplt3Z9rWWKDijeoS2HrmK4EwKBJinjRJqQrR/l8dKBi/0B00nq7SKgZ37Na+5/Q/tWGUU1V9ZbJPjZy2MYEWaf419mDCMpi7UUVz+8uGnB28ZxEYHiVnrJQm3MxytFGvdbGju5WwRw2zvin0BDtn/B+uFxYY0u2M2cOebSRDxGmQGqQfUIt4cnkc6HGwULa8UBI31Cjz0loW66QpDIL4MUm43+y6EnHzIZxWVUw6blgKy17jXAZgLZyjiOC5FNwOEuxNfui6BCIvTIerbtaUFfKcr6krBPNc+byU3yL96oQ== travis@example.org diff --git a/.travis/docker/ssh/server_key b/.travis/docker/ssh/server_key new file mode 100644 index 0000000..ae28564 --- /dev/null +++ b/.travis/docker/ssh/server_key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKQIBAAKCAgEAt3NZMSCzeyccuAlUrWGvaOaJQnAjzdv9sZDn2km6Lu5Nnc18 +IlcY8F/DjlBh8PICFM5X6penzet69pVazhF8BF9u0fd3+/wv6ZOSifJ9Uk2fOtIF +r2yjn9WW2SHMs7xA78Dgk+UVGcd6E5v00pKRNWqrilB8Zj/P4y+9jWHSd85AWpGk +Nrx9izMbyYEqu/vZFL6bPEEW+xxLtJcPseiRVp56TGhLNSJE741Hv3dyEwp7qKqg +lc/bqCPLMV4lmqdIQAqyd4BKPyJfQj/kxWK4E1L59zmJegOJI8itP13aEYY3GdEF +8Ka4cTqqp8B212QQ5x2F8rPDvCMUv7A8B+Zc3F+sqlHVLZU1sU356oZT+2MXnFcu +EdfUxCNslUeGAfgzUT8anJvLH6FhrajUBnXfxI0duxSYfGJzFS8dnHZvzrQmVt0s +VeSSQgS89jb8xlzG7+WBcBLMhXwhNuf2Ft2tWTf4qLDbo7mMQXD4Kyr7ZQim7kjR +uZ7IjdpLZMysAzoHexv33+mkA7dP1/cyNHqyn2AAkUz0HnRogumlH+8umHUuVR8A +RsF8dpeGW/CZtbJQ+YIYX+glybq3V7VzkGu0xPFcJbkJS+Yfh3xN+GQTZATMR1hR +JeRpjybMFPB/ZFe4Dyl8Sc0R5Ze00z088J/g0ISvo0ym1qI/5n5I0YSXia0CAwEA +AQKCAgEAhumgrX2UITzJZRsPmBbgDnCEf0TDQBDKiPy9Vg6kiwEcObI12XdeUuDK +i23YKX+BQlXh2BfCA7FrE88RIb1ADGM2t9mb9sgnYEr0GNkpiw6kzHhKUBHAX7qP +no254nDO/MNHJdzyYKwPvj4SlY3Olo8lKqo4YmYJd9XTPBe11f/r2e+D6fFDDsz+ +YXnJuMflhNkMhwqDYRcVIfF6TGdyA1a3MFv++0uBkP7AxjGMxi4OdSNOx/4+V3BD +bcIEO7FMdDSpvTKu57FahvlAQF1ybFu4kzVQQlg5UgSyTIiz5/Fhsm3DRZEG0dbI +TGhBvfPMbnuK18uWZlUSXEq6S0ECBpxeE8v4jpqurUrN1Wnoy7zz41Nzz6RDjmAr +kGmlkKMuMos7EABpf/VALsRhADrtweZK9CL8VdYkRXuN/9u3GV64CANTiLs/rbhN +GmX0yKhHtgnwbRSgHOJbaKcrKxdmEEuPj6ervLEfwwbiWJjyIHkXyomK1XBE7nmg +AirW+uNfcENlN0mptVmuk6Etsr61Py0J+A2xO5bWbugWRnr+sRVnZZTS21ipfsUz +zLUhQ9vtPXfHmMBm1J8lKInaScT8HS1HxHS6dDNJyGlPSOH3Y/kWNSdkn3Aju6ZA +3QcycXdYwCHXn6Bvu41x/sFRvL/b6HAIyEKQga3MzZGO8OwMGy0CggEBAOVkkPFp +JDTQwNkkFBBY9abAGjs6JQ6to/NrytlNtYrsDFB7aNx9bClpHXTPqZINmgG1AtD9 +/IpyA5QRLS+DJLeNyfvup7Czt07ZTMqX+EEGb9FACqD79dmXFCkpG3Ss2zWX7Iqt +bUs5C0u0HxY/FpiYcz0S6dgwCuvqvnCaxqb11687PCgn+d3OGVdA6TfJJEXKo3J3 +X1+lPpqQDkugV0L1xUt3qofAPGhFxCyAnxWCBfhZJCh9MdAL9ac1jS4SOkjhhGRk +dTSZ9XUDACLVgF3WiMJ/aVltz1fRxrqa0V13p/h7jYcB7M0sj3Q+HaV4U6n7qIOK +3WabPRknWS7MQHsCggEBAMy6mrOdXJ4c4hYM4UglbnsBsuz6FfiSuowl3LYzsn6h +zkqakxY4Axhc0t7ee6pS3DnJmZGs3MAmRdMDfkB0ixBdAQ6gBfHrS4Twa/VBTgwH +IaL39XooeDVkLfBfy/r/zahhR+kJkQEEPn9HRMvHHlMeMFZe1RIhDRTJuUT+RUSB +F5wxYNTD8inWvlLFAGNJL0i2XehKWrl/9zsA9Nf4D1zkKWBS+pJRCcmY3vpl4JJs +f/xM7oIjJXVkV8svXuqYU6JDy5o9zPK56sy2q7LI82tqq9qDuLmk8ahGcz4BoqRy +qeFAYY1nrmb0PJCp+jIC2Dk/R0JbXYzgEF4qJChzCfcCggEBAIFysdR5h8QCNYGT +uXrMKLvT1jmsAzN4S3fXUV41WwgtUnmsWq1qXbo0pjm/4ioYYNsrwY4cdgHOezR4 +SO5x7Ctk6SGxOJIfqIbnW01MWvye3ETSBe14ofELL4ZWuzapQP7KX+KWIYH8i+JJ +n+1W5rJv/T/ux2WHHvKowpUa0pVvUCqDm9vxSzCe2HADolgnur9jrb6vnHOF9YEV +X+vPbM7NkGuY+POoSK5zCFQwtRVXDXVrIFt04sJLrXGRZ70i7h8onCRnCDkJ1JkW +e2Is50aNBRn0+odLz2D4cVPmf9Vl67TuTBxuuqnBxqZLU0GIWHYpHJw2pd/8JIto +SAx/mLcCggEAYsU8UZ9/yYBhywWXwnjcnlepfQ8CfpQ7j9XMb9LtMI7bub5ta/DF +/YD68y8fNoMXYIHUpyVgswtD8JPk2y/ez5wvIGEvvREptA9R5lcFUmQ2ZCuAsNjJ +dejJCQkOnh+/lpaoXNOSs4zaogk+NZnxFWShKWpDHaX4a6kOyyxpOq2VOHPSJZQL +RwgldkU49K2gNFJXZ/RHZOtJ2ZuShIdW0hf5plEiNmkGcc5g9SkleT8DWDO9deeC +8OniOVK3VjL7VnOizN03/XqYvv76Qx0T4yTpmFioTFg5hlfGzYl4cCIpt1SaO+Bj +kaQPfDOlU29v5d6TgH4X2hlXjDaEj0dA7QKCAQBeORjaNa+gd0yyrLQnC8w0M1Sr +vCbUs4yzFkFWVz1CojnxxmjPJc+lnN1jOMlk9TZqN4QcZ2VZnlBIDWHXinOq6suf +ul3KYvmtx1/QQ44fKJk7haJpaAl7fbuxeOKwTQG3ClPBia0Da3955IriYeReWdur +JkaDJ1tV5QBJULOcijgL0WGgSTzcsBaO1hqhrcHqyZI4NtGvXXDsfIznn+EtW2SK +WtgnqUBvmHCncxFeysqQlDBf4tIBSJvF9j9RUJamJeoweRpnK5x4BiLrCsLRZ2oN +yLMXQTEEGdcHsIjs9G9W7yeSloxG7PHjWu93p30hrdYgkCI/1ZuvhMIVd8UY +-----END RSA PRIVATE KEY----- diff --git a/.travis/docker/ssh/server_key.pub b/.travis/docker/ssh/server_key.pub new file mode 100644 index 0000000..788daca --- /dev/null +++ b/.travis/docker/ssh/server_key.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3c1kxILN7Jxy4CVStYa9o5olCcCPN2/2xkOfaSbou7k2dzXwiVxjwX8OOUGHw8gIUzlfql6fN63r2lVrOEXwEX27R93f7/C/pk5KJ8n1STZ860gWvbKOf1ZbZIcyzvEDvwOCT5RUZx3oTm/TSkpE1aquKUHxmP8/jL72NYdJ3zkBakaQ2vH2LMxvJgSq7+9kUvps8QRb7HEu0lw+x6JFWnnpMaEs1IkTvjUe/d3ITCnuoqqCVz9uoI8sxXiWap0hACrJ3gEo/Il9CP+TFYrgTUvn3OYl6A4kjyK0/XdoRhjcZ0QXwprhxOqqnwHbXZBDnHYXys8O8IxS/sDwH5lzcX6yqUdUtlTWxTfnqhlP7YxecVy4R19TEI2yVR4YB+DNRPxqcm8sfoWGtqNQGdd/EjR27FJh8YnMVLx2cdm/OtCZW3SxV5JJCBLz2NvzGXMbv5YFwEsyFfCE25/YW3a1ZN/iosNujuYxBcPgrKvtlCKbuSNG5nsiN2ktkzKwDOgd7G/ff6aQDt0/X9zI0erKfYACRTPQedGiC6aUf7y6YdS5VHwBGwXx2l4Zb8Jm1slD5ghhf6CXJurdXtXOQa7TE8VwluQlL5h+HfE34ZBNkBMxHWFEl5GmPJswU8H9kV7gPKXxJzRHll7TTPTzwn+DQhK+jTKbWoj/mfkjRhJeJrQ== travis@example.org diff --git a/.travis/docker/test.sh b/.travis/docker/test.sh new file mode 100755 index 0000000..4e33828 --- /dev/null +++ b/.travis/docker/test.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" +script_dir="$( cd -- "$script_dir" && pwd )" +readonly script_dir +script_name="$( basename -- "${BASH_SOURCE[0]}" )" +readonly script_name + +dump() { + local prefix="${FUNCNAME[0]}" + [ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}" + + local msg + for msg; do + echo "$script_name: $prefix: $msg" + done +} + +kill_ssh_agent() { + [ -n "${SSH_AGENT_PID:+x}" ] || return 0 + dump "killing ssh-agent with PID $SSH_AGENT_PID" + kill "$SSH_AGENT_PID" +} + +spawn_ssh_agent() { + [ -n "${SSH_AGENT_PID:+x}" ] && return 0 + if ! command -v ssh-agent > /dev/null 2>&1; then + dump "could not find ssh-agent" >&2 + return 1 + fi + local output + output="$( ssh-agent -s )" + eval "$output" + if [ -z "${SSH_AGENT_PID:+x}" ]; then + dump "could not start ssh-agent" >&2 + return 1 + fi + trap kill_ssh_agent EXIT +} + +setup_ssh_agent() { + spawn_ssh_agent + + local key='ssh/client_key' + chmod 0600 -- "$key" + local password='password' + + local askpass_path + askpass_path="$( mktemp --tmpdir="$script_dir" )" + + local askpass_rm + askpass_rm="$( printf -- 'rm -- %q; trap - RETURN' "$askpass_path" )" + trap "$askpass_rm" RETURN + + chmod 0700 -- "$askpass_path" + + local echo_password + echo_password="$( printf -- 'echo %q' "$password" )" + echo "$echo_password" > "$askpass_path" + + SSH_ASKPASS="$askpass_path" DISPLAY= ssh-add "$key" > /dev/null 2>&1 < /dev/null +} + +docker_build() { + docker-compose build +} + +setup() { + setup_ssh_agent + docker_build +} + +run_server() { + docker-compose up -d server +} + +run_client() { + if [ -z "${SSH_AUTH_SOCK:+x}" ]; then + dump 'SSH_AUTH_SOCK is not defined' >&2 + return 1 + fi + dump "SSH_AUTH_SOCK: $SSH_AUTH_SOCK" + docker-compose run --rm client +} + +run() { + run_server + run_client +} + +verify() { + pushd -- "$script_dir/client/var/output/test_repo" > /dev/null + git log --oneline + popd > /dev/null +} + +main() { + pushd -- "$script_dir" > /dev/null + setup + run + verify + popd > /dev/null +} + +main diff --git a/.travis/local/test.sh b/.travis/local/test.sh index 0f1166d..90c7cd2 100755 --- a/.travis/local/test.sh +++ b/.travis/local/test.sh @@ -8,8 +8,9 @@ readonly my_repos_path="$HOME/etc/cgit-repos/my_repos.py" readonly output_path="$HOME/var/cgit-repos/output" setup_local_repo() { - mkdir -- "$local_repo_path" + mkdir -p -- "$local_repo_path" pushd -- "$local_repo_path" > /dev/null + git init echo '1' > 1.txt git add . @@ -17,6 +18,7 @@ setup_local_repo() { echo '2' > 2.txt git add . git commit -m 'second commit' + popd > /dev/null } @@ -64,10 +66,8 @@ run() { verify() { pushd -- "$output_path" > /dev/null - cd -- test_repo git log --oneline - popd > /dev/null } -- cgit v1.2.3