Merge branch 'master' into switch-to-new-projects-nodes-repo

Author: giancarloromeo

.github/mergify.yml

@@ -1,9 +1,6 @@
-# NOTE: the PR is added to the queue when all checks have passed
-# and the CI is fully green.
-# If the PR is behind the queue will take care of updating it
 queue_rules:
   - name: default
-    queue_conditions:
+    queue_conditions: # condtions to be met to add the PR to the queue (manually or automatically)
       # general prerequisits fo accept the PR in the queue
       - label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
       - label!=🤖-do-not-merge # block Mergify from merging the PR (added manually)
@@ -16,17 +13,17 @@ queue_rules:
       - "#changes-requested-reviews-by=0" # No changes requested
       - "#review-threads-unresolved=0" # All review threads resolved
 
-    merge_conditions:
+    merge_conditions: # conditions to be met before being able to merge
       # list of CI checks that need to pass
+      - check-success=system-test-environment-setup
+      - check-success=changes
+      - check-success=build-test-images
+      - check-success=build-test-images-frontend
       - check-success=unit-tests
       - check-success=integration-tests
       - check-success=system-tests
 
-# NOTE: in case of flaky tests you above checks will fail
-# the PR will be removed from the queue.
-# Once the PR is ready to be merged the flaky tests will
-# be retried automatically.
-# As soon as the CI is green, the PR will be pushed to the queue
+
 pull_request_rules:
   - name: retry flaky tests (when PR is approved)
     conditions:
@@ -41,6 +38,10 @@ pull_request_rules:
       - "#review-threads-unresolved=0" # All review threads resolved
 
       - or:
+          - check-failure=system-test-environment-setup
+          - check-failure=changes
+          - check-failure=build-test-images
+          - check-failure=build-test-images-frontend
           - check-failure=unit-tests
           - check-failure=integration-tests
           - check-failure=system-tests
@@ -51,3 +52,18 @@ pull_request_rules:
         workflow:
           dispatch:
             - workflow: ci-testing-deploy.yml
+
+  - name: Automatically add PR to queue if it meets conditions
+    conditions:
+      - "label=🤖-automerge"
+      - "label!=🤖-do-not-merge"
+      - "base=master"
+
+      - "-draft" # PR is not in draft state
+      - "-conflict" # PR has no conflicts
+      - "#approved-reviews-by>=2" # Requires 2 approvals
+      - "#changes-requested-reviews-by=0" # No requested changes
+      - "#review-threads-unresolved=0" # All review threads resolved
+    actions:
+      queue:
+        name: default

api/tests/requirements.txt

@@ -1,27 +1,27 @@
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
-attrs==24.2.0
+attrs==25.1.0
     # via
     #   aiohttp
     #   jsonschema
     #   referencing
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   -c ../../requirements/constraints.txt
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.1
     # via requests
-coverage==7.6.1
+coverage==7.6.10
     # via
     #   -r requirements.in
     #   pytest-cov
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
@@ -31,50 +31,54 @@ idna==3.10
     #   yarl
 iniconfig==2.0.0
     # via pytest
-isodate==0.6.1
+isodate==0.7.2
     # via openapi-core
 jsonschema==4.23.0
     # via
     #   openapi-core
     #   openapi-schema-validator
     #   openapi-spec-validator
-jsonschema-path==0.3.3
+jsonschema-path==0.3.4
     # via
     #   openapi-core
     #   openapi-spec-validator
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
     #   jsonschema
     #   openapi-schema-validator
 lazy-object-proxy==1.10.0
     # via openapi-spec-validator
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via werkzeug
-more-itertools==10.5.0
+more-itertools==10.6.0
     # via openapi-core
 multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
 openapi-core==0.19.4
     # via -r requirements.in
-openapi-schema-validator==0.6.2
+openapi-schema-validator==0.6.3
     # via
     #   openapi-core
     #   openapi-spec-validator
 openapi-spec-validator==0.7.1
     # via openapi-core
-packaging==24.1
+packaging==24.2
     # via
     #   pytest
     #   pytest-sugar
 parse==1.20.2
     # via openapi-core
-pathable==0.4.3
+pathable==0.4.4
     # via jsonschema-path
 pluggy==1.5.0
     # via pytest
-pytest==8.3.3
+propcache==0.2.1
+    # via
+    #   aiohttp
+    #   yarl
+pytest==8.3.4
     # via
     #   -r requirements.in
     #   pytest-asyncio
@@ -85,7 +89,7 @@ pytest-asyncio==0.23.8
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r requirements.in
 pytest-instafail==0.5.0
     # via -r requirements.in
@@ -97,28 +101,27 @@ pyyaml==6.0.2
     #   jsonschema-path
 referencing==0.35.1
     # via
+    #   -c ../../requirements/constraints.txt
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
 requests==2.32.3
     # via jsonschema-path
 rfc3339-validator==0.1.4
     # via openapi-schema-validator
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
-six==1.16.0
-    # via
-    #   isodate
-    #   rfc3339-validator
-termcolor==2.4.0
+six==1.17.0
+    # via rfc3339-validator
+termcolor==2.5.0
     # via pytest-sugar
-urllib3==2.2.3
+urllib3==2.3.0
     # via
     #   -c ../../requirements/constraints.txt
     #   requests
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via openapi-core
-yarl==1.12.1
+yarl==1.18.3
     # via aiohttp