From 91648299bace49d9190c6e914c4738092e990c88 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 22 Nov 2021 13:17:17 +0530 Subject: [PATCH] ci: fix test and revert yamls --- docker-compose.yml | 9 --------- installation/docker-compose-custom.yml | 10 ---------- installation/docker-compose-erpnext.yml | 10 ---------- installation/docker-compose-frappe.yml | 10 ---------- tests/functions.sh | 4 ++-- tests/integration-test.sh | 8 ++++---- tests/test-erpnext.sh | 16 ++++++++-------- 7 files changed, 14 insertions(+), 53 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b050973..398c7093 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -163,15 +163,6 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw - logs-vol:/home/frappe/frappe-bench/logs:rw - fix-vol-permissions: - image: frappe/erpnext-worker:${ERPNEXT_VERSION} - user: root - command: chown -R 1000:1000 /sites /assets /logs - volumes: - - sites-vol:/sites - - assets-vol:/assets - - logs-vol:/logs - volumes: mariadb-vol: redis-cache-vol: diff --git a/installation/docker-compose-custom.yml b/installation/docker-compose-custom.yml index 24a7ac9b..9dacfd91 100644 --- a/installation/docker-compose-custom.yml +++ b/installation/docker-compose-custom.yml @@ -20,7 +20,6 @@ services: - frappe-worker-default - frappe-worker-long - frappe-worker-short - - fix-vol-permissions links: - [app]-python - frappe-socketio @@ -118,15 +117,6 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw - logs-vol:/home/frappe/frappe-bench/logs:rw - fix-vol-permissions: - image: [app]-worker - user: root - command: chown -R 1000:1000 /sites /assets /logs - volumes: - - sites-vol:/sites - - assets-vol:/assets - - logs-vol:/logs - volumes: assets-vol: sites-vol: diff --git a/installation/docker-compose-erpnext.yml b/installation/docker-compose-erpnext.yml index a6dca033..1f769dd6 100644 --- a/installation/docker-compose-erpnext.yml +++ b/installation/docker-compose-erpnext.yml @@ -18,7 +18,6 @@ services: - frappe-worker-default - frappe-worker-long - frappe-worker-short - - fix-vol-permissions links: - erpnext-python - frappe-socketio @@ -115,15 +114,6 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw - logs-vol:/home/frappe/frappe-bench/logs:rw - fix-vol-permissions: - image: frappe/erpnext-worker:${ERPNEXT_VERSION} - user: root - command: chown -R 1000:1000 /sites /assets /logs - volumes: - - sites-vol:/sites - - assets-vol:/assets - - logs-vol:/logs - volumes: assets-vol: sites-vol: diff --git a/installation/docker-compose-frappe.yml b/installation/docker-compose-frappe.yml index 6128990e..5c64424e 100644 --- a/installation/docker-compose-frappe.yml +++ b/installation/docker-compose-frappe.yml @@ -18,7 +18,6 @@ services: - frappe-worker-default - frappe-worker-long - frappe-worker-short - - fix-vol-permissions links: - frappe-python - frappe-socketio @@ -115,15 +114,6 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw - logs-vol:/home/frappe/frappe-bench/logs:rw - fix-vol-permissions: - image: frappe/frappe-worker:${ERPNEXT_VERSION} - user: root - command: chown -R 1000:1000 /sites /assets /logs - volumes: - - sites-vol:/sites - - assets-vol:/assets - - logs-vol:/logs - volumes: assets-vol: sites-vol: diff --git a/tests/functions.sh b/tests/functions.sh index 132005da..55880e12 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -53,8 +53,8 @@ check_health() { print_group Loop health check docker run --name frappe_doctor \ - -v "$1_sites-vol:/home/frappe/frappe-bench/sites" \ - --network "$1_default" \ + -v "${project_name}_sites-vol:/home/frappe/frappe-bench/sites" \ + --network "${project_name}_default" \ frappe/frappe-worker:edge doctor || true cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""' diff --git a/tests/integration-test.sh b/tests/integration-test.sh index 2f105167..35eabe26 100755 --- a/tests/integration-test.sh +++ b/tests/integration-test.sh @@ -38,7 +38,7 @@ docker run \ --network ${project_name}_default \ postgres:11.8 -check_health $project_name +check_health print_group "Create new site " SITE_NAME=test.localhost @@ -133,7 +133,7 @@ docker_compose_with_args stop docker container prune -f && docker volume prune -f docker_compose_with_args up -d -check_health $project_name +check_health print_group Restore backup from S3 docker run \ @@ -149,7 +149,7 @@ docker run \ --network ${project_name}_default \ frappe/frappe-worker:edge restore-backup -check_health $project_name +check_health ping_site SITE_NAME=$PG_SITE_NAME ping_site @@ -163,7 +163,7 @@ docker run \ --network ${project_name}_default \ frappe/frappe-worker:edge new -check_health $project_name +check_health SITE_NAME=$EDGE_SITE_NAME ping_site print_group Migrate edge site diff --git a/tests/test-erpnext.sh b/tests/test-erpnext.sh index fc0eca48..a22d999b 100755 --- a/tests/test-erpnext.sh +++ b/tests/test-erpnext.sh @@ -24,6 +24,14 @@ FRAPPE_VERSION=$FRAPPE_VERSION ERPNEXT_VERSION="test" \ -f installation/erpnext-publish.yml \ up -d +docker run \ + --rm \ + --user root \ + -v ${project_name}_sites-vol:/sites \ + -v ${project_name}_assets-vol:/assets \ + -v ${project_name}_logs-vol:/logs \ + frappe/erpnext-worker:test chown -R 1000:1000 /logs /sites /assets + print_group Create site docker run \ --rm \ @@ -33,13 +41,5 @@ docker run \ --network ${project_name}_default \ frappe/erpnext-worker:test new -docker restart ${project_name}_erpnext-nginx_1 -docker restart ${project_name}_fix-vol-permissions_1 - -check_health $project_name - -# TODO: remove when pr ci run successful -docker logs ${project_name}_erpnext-nginx_1 - ping_site rm .env