Merge branch 'master' into feature/new-plus-button

Author: odeimaiz

.github/mergify.yml

@@ -0,0 +1,47 @@
+queue_rules:
+  - name: default
+    branch_protection_injection_mode: merge
+    queue_conditions:
+      # 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)
+      - base=master
+      - -draft # PR is not in draft state
+      - -conflict # No merge conflicts
+
+      # Check for required reviews
+      - "#approved-reviews-by>=2" # Requires 2 approving reviews
+      - "#changes-requested-reviews-by=0" # No changes requested
+      - "#review-threads-unresolved=0" # All review threads resolved
+
+    merge_conditions:
+      # list of CI checks that need to pass
+      - check-success=unit-tests
+      - check-success=integration-tests
+      - check-success=system-tests
+
+pull_request_rules:
+  - name: update branch if behind master
+    conditions:
+      - queue-name=default # only run if already queued
+      - label=🤖-automerge
+      - label!=🤖-do-not-merge
+      - base=master
+    actions:
+      update:
+
+  - name: retry CI on fails (used for flaky tests)
+    conditions:
+      - queue-name=default # only run if already queued
+      - label=🤖-automerge
+      - label!=🤖-do-not-merge
+      - base=master
+      - or:
+          - check-failure=unit-tests
+          - check-failure=integration-tests
+          - check-failure=system-tests
+    actions:
+      github_actions:
+        workflow:
+          dispatch:
+            - workflow: .github/workflows/ci-testing-deploy.yml

services/static-webserver/client/source/class/osparc/data/model/NodeProgressSequence.js

@@ -231,12 +231,12 @@ qx.Class.define("osparc.data.model.NodeProgressSequence", {
       const sequenceLoadingPage = new osparc.widget.ProgressSequence(qx.locale.Manager.tr("LOADING ..."));
       const nTasks = 7;
       this.__overallProgressBar = sequenceLoadingPage.addOverallProgressBar(nTasks);
-      this.__clusterUpScalingLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Increasing system capacity ..."));
-      this.__pullingSidecarLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Setting up key components ..."));
+      this.__clusterUpScalingLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Provisioning resources ..."));
+      this.__pullingSidecarLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Setting up system software ..."));
       this.__pullingOutputsLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Retrieving your output data ..."));
       this.__pullingStateLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Retrieving your work ..."));
-      this.__pullingImagesLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Installing software ..."));
-      this.__startingSoftwareLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Starting software ..."));
+      this.__pullingImagesLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Installing services ..."));
+      this.__startingSoftwareLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Starting services ..."));
       this.__pullingInputsLayout = sequenceLoadingPage.addNewTask(qx.locale.Manager.tr("Retrieving your input data ..."));
       this.__mainLoadingPage.addAt(sequenceLoadingPage, 0, {
         flex: 1