⚡️(ci) take advantage of build-in caching in Node action

Run yarn install in install-front and subsequent jobs
2024-10-28 19:42:42 +01:00 · 2024-10-28 09:45:51 +01:00 · 2024-10-25 15:15:39 +02:00 · 2024-10-25 15:15:39 +02:00 · 2024-10-25 15:15:39 +02:00 · 2024-10-24 17:27:07 +02:00
4 changed files with 73 additions and 60 deletions
@@ -16,7 +16,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
-            fetch-depth: 0
+          fetch-depth: 0
      - name: show
        run: git log
      - name: Enforce absence of print statements in code
@@ -39,7 +39,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
-            fetch-depth: 0
+          fetch-depth: 0
      - name: Check that the CHANGELOG has been modified in the current branch
        run: git whatchanged --name-only --pretty="" origin/${{ github.event.pull_request.base.ref }}..HEAD | grep CHANGELOG

@@ -63,28 +63,18 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Setup Node.js
+      - name: Setup Node.js and cache
        uses: actions/setup-node@v4
        with:
          node-version: '18.x'
+          # Per the documentation, this "caches global cache on the machine instead of node_modules"
+          # This means that a 'yarn install' is still required before using cache in subsequent jobs
+          cache: 'yarn'
+          cache-dependency-path: '**/package.json'

-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
-        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+      - name: Checkout repository
+        run: cd src/frontend/ && yarn install

-      - name: Install dependencies
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        run: cd src/frontend/ && yarn install --frozen-lockfile
-
-      - name: Cache install frontend
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v4
-        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}

  build-front:
    runs-on: ubuntu-latest
@@ -93,21 +83,14 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
+      - name: Retrieve cache
+        uses: actions/setup-node@v4
        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+          cache: 'yarn'
+          cache-dependency-path: '**/package.json'

      - name: Build CI App
-        run: cd src/frontend/ && yarn ci:build
-
-      - name: Cache build frontend
-        uses: actions/cache@v4
-        with:
-          path: src/frontend/apps/desk/out/
-          key: build-front-${{ github.run_id }}
+        run: cd src/frontend/ && yarn install && yarn ci:build

  test-front:
    runs-on: ubuntu-latest
@@ -116,15 +99,14 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
+      - name: Retrieve cache
+        uses: actions/setup-node@v4
        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+          cache: 'yarn'
+          cache-dependency-path: '**/package.json'

      - name: Test App
-        run: cd src/frontend/ && yarn app:test
+        run: cd src/frontend/ && yarn install && yarn app:test

  lint-front:
    runs-on: ubuntu-latest
@@ -133,24 +115,34 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
+      - name: Retrieve cache
+        uses: actions/setup-node@v4
        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-        
+          cache: 'yarn'
+          cache-dependency-path: '**/package.json'
+
      - name: Check linting
-        run: cd src/frontend/ && yarn lint
+        run: cd src/frontend/ && yarn install && yarn lint

  test-e2e:
    runs-on: ubuntu-latest
    needs: [build-mails, build-front]
    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        shardIndex: [1, 2, 3, 4]
+        shardTotal: [4]
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4

+      - name: Retrieve cache
+        uses: actions/setup-node@v4
+        with:
+          cache: 'yarn'
+          cache-dependency-path: '**/package.json'
+
      - name: Set services env variables
        run: |
          make create-env-files
@@ -162,13 +154,6 @@ jobs:
          name: mails-templates
          path: src/backend/core/templates/mail

-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
-        with:
-          path: 'src/frontend/**/node_modules'
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-
      - name: Restore the build cache
        uses: actions/cache@v4
        id: cache-build
@@ -196,15 +181,27 @@ jobs:
        run: cd src/frontend/apps/e2e && yarn install

      - name: Run e2e tests
-        run: cd src/frontend/ && yarn e2e:test
+        run: cd src/frontend/ && yarn e2e:test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}

      - uses: actions/upload-artifact@v4
        if: always()
        with:
-          name: playwright-report
+          name: playwright-report-${{ matrix.shardIndex }}
          path: src/frontend/apps/e2e/report/
          retention-days: 7

+  tests-e2e-feedback:
+    runs-on: ubuntu-latest
+    needs: [test-e2e]
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Some tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1
+
  build-mails:
    runs-on: ubuntu-latest
    defaults:
@@ -226,8 +223,8 @@ jobs:
      - name: Persist mails' templates
        uses: actions/upload-artifact@v4
        with:
-            name: mails-templates
-            path: src/backend/core/templates/mail
+          name: mails-templates
+          path: src/backend/core/templates/mail

  lint-back:
    runs-on: ubuntu-latest
@@ -8,6 +8,12 @@ and this project adheres to

 ## [Unreleased]

+### Fixed
+
+- 🔧(sentry) restore default integrations
+- 🔇(backend) remove Sentry duplicated warning/errors
+- 👷(ci) add sharding e2e tests  #467
+
 ## [1.4.1] - 2024-10-23

 ### Fixed
@@ -1,3 +1,5 @@
+# pylint: disable=line-too-long
+
 import datetime
 import os
 import re
@@ -95,10 +97,13 @@ def prepare_release(version, kind):
        run_command(f"git push origin {branch_to_release}", shell=True)
    sys.stdout.write(f"""
    PLEASE DO THE FOLLOWING INSTRUCTIONS:
-    --> Please submit PR and merge code to main than tag version
+    --> Please submit PR and merge code to main 
+    --> Then do:
+    >> git checkout main
+    >> git pull
    >> git tag -a v{version} 
    >> git push origin v{version} 
-    --> Please check docker image: https://hub.docker.com/r/lasuite/people-backend/tags
+    --> Please check and wait for the docker image v{version} to be published here: https://hub.docker.com/r/lasuite/people-backend/tags
    >> git tag -d preprod
    >> git tag preprod
    >> git push -f origin preprod
@@ -18,6 +18,7 @@ from django.utils.translation import gettext_lazy as _
 import sentry_sdk
 from configurations import Configuration, values
 from sentry_sdk.integrations.django import DjangoIntegration
+from sentry_sdk.integrations.logging import ignore_logger

 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -488,10 +489,14 @@ class Base(Configuration):
                release=get_release(),
                integrations=[DjangoIntegration()],
                traces_sample_rate=0.1,
-                default_integrations=False,
            )
-            with sentry_sdk.configure_scope() as scope:
-                scope.set_extra("application", "backend")
+
+            # Add the application name to the Sentry scope
+            scope = sentry_sdk.get_global_scope()
+            scope.set_tag("application", "backend")
+
+            # Ignore the logs added by the DockerflowMiddleware
+            ignore_logger("request.summary")


 class Build(Base):
Author	SHA1	Message	Date
Laurent Bossavit	8ffad9346f	⚡️(ci) take advantage of build-in caching in Node action Run yarn install in install-front and subsequent jobs	2024-10-28 19:42:42 +01:00
Laurent Bossavit	5fc109b440	⚡️(ci) take advantage of build-in caching in Node action Caching was ineffective on E2E setup, this simplifies caching logic and will hopefully speed up the E2E testing part of the build	2024-10-28 09:45:51 +01:00
Quentin BEY	2d46b7d504	🔧(backend) fix sentry deprecated scope `sentry_sdk.configure_scope` is deprecated and will be removed in the next major version.	2024-10-25 15:15:39 +02:00
Quentin BEY	54e5be81e2	🔇(backend) remove Sentry duplicated warning/errors The `DockerflowMiddleware` job is to add logs, sadly the Sentry LoggingIntegration also catch these logs (at level WARNING and above) which results in an extra alert for the same purpose (the exception + the logger.error). see https://github.com/mozilla-services/Dockerflow/blob/main/docs/mozlog.md The fix is to ask Sentry to ignore this specific loggger (`request.summary`).	2024-10-25 15:15:39 +02:00
Marie PUPO JEAMMET	31944e8083	🔧(backend) restore Sentry default integrations This reverts `30229e11f9`	2024-10-25 15:15:39 +02:00
Sabrina Demagny	d1421dbe8c	✏️(scripts) add some details for manual steps Some instructions are missing to explain manual steps	2024-10-24 17:27:07 +02:00
Marie PUPO JEAMMET	c8800259ae	🐛(changelog) move e2e sharding to unreleased e2e sharding was merged without updating it to unreleased. Fixes that	2024-10-24 17:11:29 +02:00
NathanPanchout	bfc2462103	👷(ci) add sharding e2e tests e2e tests take too long to run. We can easily reduce this time by 2 by adding shards	2024-10-24 16:35:07 +02:00