Merge remote-tracking branch 'upstream/master' into pr-osparc-stream-zipping-of-s3-content

Author: Andrei Neagu

.env-devel

@@ -279,7 +279,6 @@ WB_GC_GROUPS=0
 WB_GC_INVITATIONS=null
 WB_GC_LOGIN=null
 WB_GC_LOGLEVEL=INFO
-WB_GC_META_MODELING=0
 WB_GC_NOTIFICATIONS=0
 WB_GC_PAYMENTS=null
 WB_GC_PRODUCTS=0
@@ -294,7 +293,6 @@ WB_GC_STUDIES_DISPATCHER=null
 WB_GC_TAGS=0
 WB_GC_TRACING=null
 WB_GC_USERS={}
-WB_GC_VERSION_CONTROL=0
 WB_GC_WALLETS=0
 
 WB_DB_EL_ACTIVITY=null
@@ -311,7 +309,6 @@ WB_DB_EL_GROUPS=0
 WB_DB_EL_INVITATIONS=null
 WB_DB_EL_LOGIN=null
 WB_DB_EL_LOGLEVEL=INFO
-WB_DB_EL_META_MODELING=0
 WB_DB_EL_NOTIFICATIONS=0
 WB_DB_EL_PAYMENTS=null
 WB_DB_EL_PRODUCTS=0
@@ -326,7 +323,6 @@ WB_DB_EL_STUDIES_DISPATCHER=null
 WB_DB_EL_TAGS=0
 WB_DB_EL_TRACING=null
 WB_DB_EL_USERS={}
-WB_DB_EL_VERSION_CONTROL=0
 WB_DB_EL_WALLETS=0
 
 # WEBSERVER ----
@@ -380,7 +376,6 @@ WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
-WEBSERVER_META_MODELING=1
 WEBSERVER_NOTIFICATIONS=1
 WEBSERVER_PAYMENTS={}
 WEBSERVER_PORT=8080
@@ -398,4 +393,3 @@ WEBSERVER_STUDIES_DISPATCHER={}
 WEBSERVER_TAGS=1
 WEBSERVER_TRACING=null
 WEBSERVER_USERS={}
-WEBSERVER_VERSION_CONTROL=1

.github/mergify.yml

@@ -22,48 +22,3 @@ queue_rules:
       - check-success=unit-tests
       - check-success=integration-tests
       - check-success=system-tests
-
-
-pull_request_rules:
-  - name: retry flaky tests (when PR is approved)
-    conditions:
-      - label=🤖-automerge
-      - label!=🤖-do-not-merge
-      - base=master
-
-      - -draft # PR is not in draft state
-      - -conflict # No merge conflicts
-      - "#approved-reviews-by>=2" # Requires 2 approving reviews
-      - "#changes-requested-reviews-by=0" # No changes requested
-      - "#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
-    actions:
-      comment:
-        message: "Restarted CI due to failing tests"
-      github_actions:
-        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