Merge remote-tracking branch 'upstream/master' into pr-osparc-docker-socket-via-http-interface

Author: Andrei Neagu

.env-devel

@@ -139,6 +139,13 @@ DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
 
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 
+WEBSERVER_LICENSES={}
+LICENSES_ITIS_VIP_SYNCER_ENABLED=false
+LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}
+LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
+LICENSES_SPEAG_PHANTOMS_API_URL=https://replace-with-speag-api/{category}
+LICENSES_SPEAG_PHANTOMS_CATEGORIES='{"ComputationalPhantom": "Phantom of the Opera"}'
+
 # Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
 INVITATIONS_DEFAULT_PRODUCT=osparc
 INVITATIONS_HOST=invitations
@@ -278,7 +285,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
@@ -293,7 +299,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
@@ -310,7 +315,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
@@ -325,7 +329,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 ----
@@ -377,10 +380,8 @@ WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
-WEBSERVER_LICENSES=true
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
-WEBSERVER_META_MODELING=1
 WEBSERVER_NOTIFICATIONS=1
 WEBSERVER_PAYMENTS={}
 WEBSERVER_PORT=8080
@@ -398,4 +399,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

.github/workflows/ci-testing-pull-request.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Check openapi specs are up to date
         run: |
           if ! ./ci/github/helpers/openapi-specs-diff.bash diff \
-            https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/${{ github.event.after }} \
+            https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/${{ github.event.pull_request.head.sha }} \
             .; then \
             echo "::error:: OAS are not up to date. Run 'make openapi-specs' to update them"; exit 1; \
           fi