From ecad16e1a8f40f903a09df4a2cd0b6ab034cb3a8 Mon Sep 17 00:00:00 2001 From: Lev Date: Mon, 8 Nov 2021 19:30:00 +0300 Subject: [PATCH] test: Set failfast, remove ERPNext reference --- tests/integration-test.sh | 47 ++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/tests/integration-test.sh b/tests/integration-test.sh index 14483f26..2b8f8f84 100755 --- a/tests/integration-test.sh +++ b/tests/integration-test.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # shellcheck source=functions.sh source tests/functions.sh @@ -10,15 +12,15 @@ docker_compose_with_args() { docker-compose \ -p $project_name \ -f installation/docker-compose-common.yml \ - -f installation/docker-compose-erpnext.yml \ - -f installation/erpnext-publish.yml \ + -f installation/docker-compose-frappe.yml \ + -f installation/frappe-publish.yml \ $@ } check_migration_complete() { print_group Check migration - container_id=$(docker_compose_with_args ps -q erpnext-python) + container_id=$(docker_compose_with_args ps -q frappe-python) thelogs=$(docker logs "${container_id}" 2>&1 | grep "Starting gunicorn") INCREMENT=0 @@ -45,7 +47,7 @@ check_health() { docker run --name frappe_doctor \ -v "${project_name}_sites-vol:/home/frappe/frappe-bench/sites" \ --network "${project_name}_default" \ - frappe/erpnext-worker:edge doctor || true + frappe/frappe-worker:edge doctor || true cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""' doctor_log=$(eval "$cmd") @@ -93,10 +95,9 @@ SITE_NAME=test.localhost docker run \ --rm \ -e SITE_NAME=$SITE_NAME \ - -e INSTALL_APPS=erpnext \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:v13 new + frappe/frappe-worker:v13 new ping_site @@ -123,7 +124,7 @@ docker run \ -e POSTGRES_PASSWORD=admin \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge new + frappe/frappe-worker:edge new check_migration_complete SITE_NAME=$PG_SITE_NAME ping_site @@ -134,7 +135,7 @@ docker run \ -e WITH_FILES=1 \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge backup + frappe/frappe-worker:edge backup MINIO_ACCESS_KEY="AKIAIOSFODNN7EXAMPLE" MINIO_SECRET_KEY="wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" @@ -161,12 +162,12 @@ docker run \ --no-ssl \ --host=minio:9000 \ --host-bucket=minio:9000 \ - mb s3://erpnext + mb s3://frappe print_group Push backup docker run \ --rm \ - -e BUCKET_NAME=erpnext \ + -e BUCKET_NAME=frappe \ -e REGION=us-east-1 \ -e BUCKET_DIR=local \ -e ACCESS_KEY_ID=$MINIO_ACCESS_KEY \ @@ -174,7 +175,7 @@ docker run \ -e ENDPOINT_URL=http://minio:9000 \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge push-backup + frappe/frappe-worker:edge push-backup print_group Prune and restart services docker_compose_with_args stop @@ -187,7 +188,7 @@ print_group Restore backup from S3 docker run \ --rm \ -e MYSQL_ROOT_PASSWORD=admin \ - -e BUCKET_NAME=erpnext \ + -e BUCKET_NAME=frappe \ -e BUCKET_DIR=local \ -e ACCESS_KEY_ID=$MINIO_ACCESS_KEY \ -e SECRET_ACCESS_KEY=$MINIO_SECRET_KEY \ @@ -195,7 +196,7 @@ docker run \ -e REGION=us-east-1 \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge restore-backup + frappe/frappe-worker:edge restore-backup check_health ping_site @@ -206,10 +207,10 @@ print_group "Create new site (edge)" docker run \ --rm \ -e SITE_NAME=$EDGE_SITE_NAME \ - -e INSTALL_APPS=erpnext \ + -e INSTALL_APPS=frappe \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge new + frappe/frappe-worker:edge new check_health SITE_NAME=$EDGE_SITE_NAME ping_site @@ -221,7 +222,7 @@ docker run \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ -v ${project_name}_assets-vol:/home/frappe/frappe-bench/sites/assets \ --network ${project_name}_default \ - frappe/erpnext-worker:edge migrate + frappe/frappe-worker:edge migrate check_migration_complete @@ -229,7 +230,7 @@ print_group "Restore backup S3 (overwrite)" docker run \ --rm \ -e MYSQL_ROOT_PASSWORD=admin \ - -e BUCKET_NAME=erpnext \ + -e BUCKET_NAME=frappe \ -e BUCKET_DIR=local \ -e ACCESS_KEY_ID=$MINIO_ACCESS_KEY \ -e SECRET_ACCESS_KEY=$MINIO_SECRET_KEY \ @@ -237,7 +238,7 @@ docker run \ -e REGION=us-east-1 \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge restore-backup + frappe/frappe-worker:edge restore-backup check_migration_complete ping_site @@ -247,14 +248,14 @@ docker run \ --rm \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge console $SITE_NAME + frappe/frappe-worker:edge console $SITE_NAME print_group "Check console for $PG_SITE_NAME" docker run \ --rm \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge console $PG_SITE_NAME + frappe/frappe-worker:edge console $PG_SITE_NAME print_group "Check drop site for $SITE_NAME (MariaDB)" docker run \ @@ -262,7 +263,7 @@ docker run \ -e SITE_NAME=$SITE_NAME \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge drop + frappe/frappe-worker:edge drop print_group "Check drop site for $PG_SITE_NAME (Postgres)" docker run \ @@ -270,7 +271,7 @@ docker run \ -e SITE_NAME=$PG_SITE_NAME \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ - frappe/erpnext-worker:edge drop + frappe/frappe-worker:edge drop print_group Check bench --help docker run \ @@ -278,4 +279,4 @@ docker run \ -v ${project_name}_sites-vol:/home/frappe/frappe-bench/sites \ --network ${project_name}_default \ --user frappe \ - frappe/erpnext-worker:edge bench --help + frappe/frappe-worker:edge bench --help