e2e improvements (#2021)

odeimaiz · web-flow · commit 691ad1e3f419 · 2020-12-07T10:32:14.000+01:00
* @sanderegg use our registry-auth * @sanderegg listen all addresses * Allow demo mode in portal e2e
diff --git a/Makefile b/Makefile
@@ -199,7 +199,7 @@ CPU_COUNT = $(shell cat /proc/cpuinfo | grep processor | wc -l )
 .deploy-ops: .stack-ops.yml
 	# Deploy stack 'ops'
 ifndef ops_disabled
-	@docker stack deploy -c $< ops
+	@docker stack deploy --with-registry-auth -c $< ops
 else
 	@echo "Explicitly disabled with ops_disabled flag in CLI"
 endif
@@ -209,15 +209,15 @@ up-devel: .stack-simcore-development.yml .init-swarm $(CLIENT_WEB_OUTPUT) ## Dep
 	# Start compile+watch front-end container [front-end]
 	$(MAKE_C) services/web/client down compile-dev flags=--watch
 	# Deploy stack $(SWARM_STACK_NAME) [back-end]
-	@docker stack deploy -c $< $(SWARM_STACK_NAME)
+	@docker stack deploy --with-registry-auth -c $< $(SWARM_STACK_NAME)
 	$(MAKE) .deploy-ops
 	$(MAKE_C) services/web/client follow-dev-logs
 
 
 up-prod: .stack-simcore-production.yml .init-swarm ## Deploys local production stack and ops stack (pass 'make ops_disabled=1 up-...' to disable or target=<service-name> to deploy a single service)
 ifeq ($(target),)
 	# Deploy stack $(SWARM_STACK_NAME)
-	@docker stack deploy -c $< $(SWARM_STACK_NAME)
+	@docker stack deploy --with-registry-auth -c $< $(SWARM_STACK_NAME)
 	$(MAKE) .deploy-ops
 else
 	# deploys ONLY $(target) service
@@ -226,7 +226,7 @@ endif
 
 up-version: .stack-simcore-version.yml .init-swarm ## Deploys versioned stack '$(DOCKER_REGISTRY)/{service}:$(DOCKER_IMAGE_TAG)' and ops stack (pass 'make ops_disabled=1 up-...' to disable)
 	# Deploy stack $(SWARM_STACK_NAME)
-	@docker stack deploy -c $< $(SWARM_STACK_NAME)
+	@docker stack deploy --with-registry-auth -c $< $(SWARM_STACK_NAME)
 	$(MAKE) .deploy-ops
 
 up-latest:
diff --git a/services/docker-compose.local.yml b/services/docker-compose.local.yml
@@ -78,6 +78,8 @@ services:
         "log_duration=true",
         "-c",
         "log_line_prefix=%m [%p] %q%u@%d/%a ",
+        "-c",
+        "listen_addresses=\"*\"",
       ]
 
   rabbit:
diff --git a/tests/e2e/portal/2D_Plot.js b/tests/e2e/portal/2D_Plot.js
@@ -1,21 +1,22 @@
-// node 2D_Plot.js [url_prefix] [template_uuid]
+// node 2D_Plot.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const auto = require('../utils/auto');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "2DPlot_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/3D_Anatomical.js b/tests/e2e/portal/3D_Anatomical.js
@@ -1,20 +1,21 @@
-// node 3D_Anatomical.js [url_prefix] [template_uuid]
+// node 3D_Anatomical.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "3DAnatomical_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/3D_EM.js b/tests/e2e/portal/3D_EM.js
@@ -1,20 +1,21 @@
-// node 3D_EM.js [url_prefix] [template_uuid]
+// node 3D_EM.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "3DEM_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/Bornstein.js b/tests/e2e/portal/Bornstein.js
@@ -1,20 +1,21 @@
-// node Bornstein.js [url_prefix] [template_uuid]
+// node Bornstein.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "Bornstein_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/CC_Human.js b/tests/e2e/portal/CC_Human.js
@@ -1,20 +1,21 @@
-// node CC_Human.js [url_prefix] [template_uuid]
+// node CC_Human.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "CCHuman_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/CC_Rabbit.js b/tests/e2e/portal/CC_Rabbit.js
@@ -1,20 +1,21 @@
-// node CC_Rabbit.js [url_prefix] [template_uuid]
+// node CC_Rabbit.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "CCRabbit_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/Mattward.js b/tests/e2e/portal/Mattward.js
@@ -1,20 +1,21 @@
-// node Mattward.js [url_prefix] [template_uuid]
+// node Mattward.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID;
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid;
 const screenshotPrefix = "Mattward_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/portal/opencor.js b/tests/e2e/portal/opencor.js
@@ -1,20 +1,21 @@
-// node opencor.js [url_prefix] [template_uuid]
+// node opencor.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
-if (args.length < 1) {
-  process.exit(1);
-}
-const URL = args[0];
-const TEMPLATE_UUID = args[1];
-const anonURL = URL + TEMPLATE_UUID + "?stimulation_mode=1&stimulation_level=0.5";
+const {
+  urlPrefix,
+  templateUuid,
+  enableDemoMode
+} = utils.parseCommandLineArgumentsTemplate(args);
+
+const anonURL = urlPrefix + templateUuid + "?stimulation_mode=1&stimulation_level=0.5";
 const screenshotPrefix = "Opencor_";
 
 
 async function runTutorial () {
-  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix);
+  const tutorial = new tutorialBase.TutorialBase(anonURL, screenshotPrefix, null, null, null, enableDemoMode);
 
   tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
diff --git a/tests/e2e/utils/utils.js b/tests/e2e/utils/utils.js
@@ -1,4 +1,5 @@
 const pathLib = require('path');
+const URL = require('url').URL;
 
 const SCREENSHOTS_DIR = "../screenshots/";
 
@@ -27,6 +28,25 @@ function parseCommandLineArguments(args) {
   }
 }
 
+function parseCommandLineArgumentsTemplate(args) {
+  // node $template.js [url] [template_uuid] [--demo]
+
+  if (args.length < 2) {
+    console.log('More arguments expected: $template.js [url_prefix] [template_uuid] [--demo]');
+    process.exit(1);
+  }
+
+  const urlPrefix = args[0];
+  const templateUuid = args[1];
+  const enableDemoMode = args.includes("--demo");
+
+  return {
+    urlPrefix,
+    templateUuid,
+    enableDemoMode
+  }
+}
+
 function getUserAndPass(args) {
   const userPass = {
     user: null,
@@ -307,7 +327,9 @@ function getGrayLogSnapshotUrl(targetUrl, since_secs = 30) {
     "osparc.speag.com": "https://monitoring.osparc.speag.com/graylog/",
   };
 
-  const { hostname } = new URL(targetUrl)
+  const {
+    hostname
+  } = new URL(targetUrl)
   const monitoringBaseUrl = table[hostname] || null;
 
   if (monitoringBaseUrl) {
@@ -345,5 +367,6 @@ module.exports = {
   takeScreenshot,
   extractWorkbenchData,
   parseCommandLineArguments,
+  parseCommandLineArgumentsTemplate,
   getGrayLogSnapshotUrl
 }

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ services:`
`78`	`78`	`"log_duration=true",`
`79`	`79`	`"-c",`
`80`	`80`	`"log_line_prefix=%m [%p] %q%u@%d/%a ",`
	`81`	`+ "-c",`
	`82`	`+ "listen_addresses=\"*\"",`
`81`	`83`	`]`
`82`	`84`
`83`	`85`	`rabbit:`