From 73c4f62a8e2bc3442dd672d37526e09c8d15191c Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 2 Nov 2022 13:59:25 +0100 Subject: [PATCH 1/7] e2e testing: disable video recording --- e2e-tests/cypress/tests/cypress.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-tests/cypress/tests/cypress.config.ts b/e2e-tests/cypress/tests/cypress.config.ts index ad6a8d7de..9621b7a00 100644 --- a/e2e-tests/cypress/tests/cypress.config.ts +++ b/e2e-tests/cypress/tests/cypress.config.ts @@ -36,6 +36,7 @@ export default defineConfig({ supportFile: "cypress/support/index.ts", viewportHeight: 720, viewportWidth: 1280, + video: false, retries: { runMode: 2, openMode: 0, From d2f80e27c440c611e7fbf6b3c931f9692bd41fe4 Mon Sep 17 00:00:00 2001 From: mahula Date: Wed, 2 Nov 2022 17:36:40 +0100 Subject: [PATCH 2/7] github workflow: restructure e2e steps for runtime reduction --- .github/workflows/test.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d467ff987..e92584cc3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -627,8 +627,8 @@ jobs: - name: Boot up test system | docker-compose backend run: docker-compose up --detach --no-deps backend - - name: Sleep for 90 seconds - run: sleep 90s + - name: Boot up test system | docker-compose frontends + run: docker-compose up --detach --no-deps frontend admin nginx - name: Boot up test system | seed backend run: | @@ -639,12 +639,6 @@ jobs: yarn && yarn seed cd .. - - name: Boot up test system | docker-compose frontends - run: docker-compose up --detach --no-deps frontend admin nginx - - - name: Sleep for 2.5 minutes - run: sleep 150s - ########################################################################## # END-TO-END TESTS ####################################################### ########################################################################## From 0a02a96885cab5fd58930ae64903d278017c812b Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 4 Nov 2022 11:01:20 +0100 Subject: [PATCH 3/7] github workflow: set reqiured image names in docker-compose.test.yml --- docker-compose.test.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 79ee46906..790bd468d 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,6 +1,25 @@ version: "3.4" services: + ######################################################## + # FRONTEND ############################################# + ######################################################## + frontend: + image: gradido/frontend:test + build: + target: test + environment: + - NODE_ENV="test" + + ######################################################## + # ADMIN INTERFACE ###################################### + ######################################################## + admin: + image: gradido/admin:test + build: + target: test + environment: + - NODE_ENV="test" ######################################################## # BACKEND ############################################## @@ -21,15 +40,19 @@ services: # DATABASE ############################################# ######################################################## database: + image: gradido/database:test_up build: context: ./database target: test_up + environment: + - NODE_ENV="test" # restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run ######################################################### ## MARIADB ############################################## ######################################################### mariadb: + image: gradido/mariadb:test networks: - internal-net - external-net @@ -51,6 +74,12 @@ services: - external-net volumes: - /sessions + + ######################################################### + ## NGINX ################################################ + ######################################################### + nginx: + image: gradido/nginx:test networks: external-net: From ece9e21aaf42c79ec6bb9ff96e5edab6ae735a23 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 4 Nov 2022 11:10:50 +0100 Subject: [PATCH 4/7] github workflow: restructure system boot uo steps and reduce wait time --- .github/workflows/test.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e92584cc3..04fa17ae3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,9 @@ name: gradido test CI -on: push +on: + push: + branches: + - 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time jobs: ############################################################################## @@ -616,19 +619,16 @@ jobs: # BOOT UP THE TEST SYSTEM ################################################ ########################################################################## - name: Boot up test system | docker-compose mariadb - run: docker-compose up --detach mariadb - - - name: Sleep for 30 seconds - run: sleep 30s + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb - name: Boot up test system | docker-compose database - run: docker-compose up --detach --no-deps database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database - name: Boot up test system | docker-compose backend - run: docker-compose up --detach --no-deps backend + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend - - name: Boot up test system | docker-compose frontends - run: docker-compose up --detach --no-deps frontend admin nginx + - name: Sleep for 10 seconds + run: sleep 10s - name: Boot up test system | seed backend run: | @@ -639,6 +639,12 @@ jobs: yarn && yarn seed cd .. + - name: Boot up test system | docker-compose frontends + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx + + - name: Sleep for 15 seconds + run: sleep 15s + ########################################################################## # END-TO-END TESTS ####################################################### ########################################################################## From 958b681e94c4e0626f9f6d0adc107cf6c5dc7cfa Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 4 Nov 2022 11:12:44 +0100 Subject: [PATCH 5/7] github workflow: reuse system images build in previuos jobs --- .github/workflows/test.yml | 87 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 04fa17ae3..77546efb2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -563,7 +563,7 @@ jobs: end-to-end-tests: name: End-to-End Tests runs-on: ubuntu-latest - # needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx] + needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx] steps: ########################################################################## # CHECKOUT CODE ########################################################## @@ -573,48 +573,49 @@ jobs: ########################################################################## # DOWNLOAD DOCKER IMAGES ################################################# ########################################################################## - # - name: Download Docker Image (Mariadb) - # uses: actions/download-artifact@v3 - # with: - # name: docker-mariadb-test - # path: /tmp - # - name: Load Docker Image (Mariadb) - # run: docker load < /tmp/mariadb.tar - # - name: Download Docker Image (Database Up) - # uses: actions/download-artifact@v3 - # with: - # name: docker-database-test_up - # path: /tmp - # - name: Load Docker Image (Database Up) - # run: docker load < /tmp/database_up.tar - # - name: Download Docker Image (Backend) - # uses: actions/download-artifact@v3 - # with: - # name: docker-backend-test - # path: /tmp - # - name: Load Docker Image (Backend) - # run: docker load < /tmp/backend.tar - # - name: Download Docker Image (Frontend) - # uses: actions/download-artifact@v3 - # with: - # name: docker-frontend-test - # path: /tmp - # - name: Load Docker Image (Frontend) - # run: docker load < /tmp/frontend.tar - # - name: Download Docker Image (Admin Interface) - # uses: actions/download-artifact@v3 - # with: - # name: docker-admin-test - # path: /tmp - # - name: Load Docker Image (Admin Interface) - # run: docker load < /tmp/admin.tar - # - name: Download Docker Image (Nginx) - # uses: actions/download-artifact@v3 - # with: - # name: docker-nginx-test - # path: /tmp - # - name: Load Docker Image (Nginx) - # run: docker load < /tmp/nginx.tar + - name: Download Docker Image (Mariadb) + uses: actions/download-artifact@v3 + with: + name: docker-mariadb-test + path: /tmp + - name: Load Docker Image (Mariadb) + run: docker load < /tmp/mariadb.tar + - name: Download Docker Image (Database Up) + uses: actions/download-artifact@v3 + with: + name: docker-database-test_up + path: /tmp + - name: Load Docker Image (Database Up) + run: docker load < /tmp/database_up.tar + - name: Download Docker Image (Backend) + uses: actions/download-artifact@v3 + with: + name: docker-backend-test + path: /tmp + - name: Load Docker Image (Backend) + run: docker load < /tmp/backend.tar + - name: Download Docker Image (Frontend) + uses: actions/download-artifact@v3 + with: + name: docker-frontend-test + path: /tmp + - name: Load Docker Image (Frontend) + run: docker load < /tmp/frontend.tar + - name: Download Docker Image (Admin Interface) + uses: actions/download-artifact@v3 + with: + name: docker-admin-test + path: /tmp + - name: Load Docker Image (Admin Interface) + run: docker load < /tmp/admin.tar + - name: Download Docker Image (Nginx) + uses: actions/download-artifact@v3 + with: + name: docker-nginx-test + path: /tmp + - name: Load Docker Image (Nginx) + run: docker load < /tmp/nginx.tar + ########################################################################## # BOOT UP THE TEST SYSTEM ################################################ ########################################################################## From dbdb0f4221fdc509ab6ff019e37035b53deb0ede Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 4 Nov 2022 11:19:49 +0100 Subject: [PATCH 6/7] github workflow: set nginx building job after jobs for frontend, backend, and admin interface --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77546efb2..9290d8d02 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -142,7 +142,7 @@ jobs: build_test_nginx: name: Docker Build Test - Nginx runs-on: ubuntu-latest - #needs: [nothing] + needs: [build_test_backend, build_test_admin, build_test_frontend] steps: ########################################################################## # CHECKOUT CODE ########################################################## From 668546e49fb77cc164a7b04eba52ce1d8db7bf0e Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 4 Nov 2022 12:19:36 +0100 Subject: [PATCH 7/7] github workflow: remove branch specific trigger --- .github/workflows/test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9290d8d02..c3238507a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,6 @@ name: gradido test CI -on: - push: - branches: - - 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time +on: push jobs: ##############################################################################