From f2d81d3d4f761ecaef31fee26528d7943ee31ca6 Mon Sep 17 00:00:00 2001 From: a-tylenda Date: Tue, 20 Feb 2024 11:31:17 +0000 Subject: [PATCH 1/2] Update refapps names in tests --- bdd/features/e2e/E2E-007-host-client.feature | 6 +++--- bdd/features/e2e/E2E-010-cli.feature | 6 +++--- bdd/features/e2e/E2E-016-errors.feature | 4 ++-- bdd/features/hub/HUB-001-host-config.feature | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bdd/features/e2e/E2E-007-host-client.feature b/bdd/features/e2e/E2E-007-host-client.feature index 3edd04424..c3601dec0 100644 --- a/bdd/features/e2e/E2E-007-host-client.feature +++ b/bdd/features/e2e/E2E-007-host-client.feature @@ -5,7 +5,7 @@ Feature: Test for host client used by sequences @ci-api @cli Scenario: E2E-007 TC-001 Test sequence with basic host client methods like getVersion(), getStatus(), etc. Given I set config for local Hub - When I execute CLI with "seq send ../packages/hostclient-basic.tar.gz" + When I execute CLI with "seq send ../packages/js-hostclient-basic.tar.gz" When I execute CLI with "seq start -" And wait for "3000" ms When I execute CLI with "inst output -" without waiting for the end @@ -18,10 +18,10 @@ Feature: Test for host client used by sequences @ci-api @cli Scenario: E2E-007 TC-002 Test Sequence that starts another Sequence Given I set config for local Hub - When I execute CLI with "seq send ../packages/hostclient-basic.tar.gz" + When I execute CLI with "seq send ../packages/js-hostclient-basic.tar.gz" And I execute CLI with "seq info -" And I get sequence id - Then I start "hostclient-start-seq" with the first sequence id + Then I start "js-hostclient-start-seq" with the first sequence id When I execute CLI with "inst output -" without waiting for the end Then I confirm data received And I execute CLI with "inst kill - --removeImmediately" diff --git a/bdd/features/e2e/E2E-010-cli.feature b/bdd/features/e2e/E2E-010-cli.feature index 098652ebf..74f04663a 100644 --- a/bdd/features/e2e/E2E-010-cli.feature +++ b/bdd/features/e2e/E2E-010-cli.feature @@ -79,7 +79,7 @@ Feature: CLI tests @ci-api @cli Scenario: E2E-010 TC-009 Get 404 on health endpoint for finished Instance - When I execute CLI with "seq send ../packages/inert-function.tar.gz" + When I execute CLI with "seq send ../packages/js-inert-function.tar.gz" When I execute CLI with "seq start -" When I execute CLI with "inst health -" And I wait for Instance to end @@ -88,7 +88,7 @@ Feature: CLI tests @ci-api @cli Scenario: E2E-010 TC-010 Test Instance 'log' option - When I execute CLI with "seq send ../packages/inert-function.tar.gz" + When I execute CLI with "seq send ../packages/js-inert-function.tar.gz" When I execute CLI with "seq start -" When I execute CLI with "inst log -" without waiting for the end Then I confirm instance logs received @@ -181,4 +181,4 @@ Feature: CLI tests When I execute CLI with "seq send ../packages/python-weather-args.tar.gz" And I execute CLI with "seq start - --startup-config ../bdd/data/python-weather-startup-config.json" And I execute CLI with "inst info -" - Then Instance info should contain provided parameters in "python-weather-startup-config.json" \ No newline at end of file + Then Instance info should contain provided parameters in "python-weather-startup-config.json" diff --git a/bdd/features/e2e/E2E-016-errors.feature b/bdd/features/e2e/E2E-016-errors.feature index 7c4d5d98b..48ea17af3 100644 --- a/bdd/features/e2e/E2E-016-errors.feature +++ b/bdd/features/e2e/E2E-016-errors.feature @@ -3,6 +3,6 @@ Feature: Test error handling while sequence is uploaded @ci-instance-node Scenario: E2E-016 TC-001 Run errored sequence Given I set config for local Hub - When I deploy sequence "bad-sequence.tar.gz" + When I deploy sequence "js-bad-sequence.tar.gz" Then I should see error message: "Sequence entrypoint path app.js is invalid. Check `main` field in Sequence package.json" - Then I should see exitCode: "1" \ No newline at end of file + Then I should see exitCode: "1" diff --git a/bdd/features/hub/HUB-001-host-config.feature b/bdd/features/hub/HUB-001-host-config.feature index bee96a0bd..b73dd400b 100644 --- a/bdd/features/hub/HUB-001-host-config.feature +++ b/bdd/features/hub/HUB-001-host-config.feature @@ -28,7 +28,7 @@ Feature: HUB-001 Host configuration @starts-host @docker-specific Scenario: HUB-001 TC-009 Set runner image (--runner-image) When hub process is started with parameters "-P 9002 --instances-server-port 19002 --runner-image repo.int.scp.ovh/scramjet/runner:0.10.0-pre.7" - And sequence "../packages/inert-function.tar.gz" is loaded + And sequence "../packages/js-inert-function.tar.gz" is loaded And instance started And get runner container information Then container uses "repo.int.scp.ovh/scramjet/runner:0.10.0-pre.7" image @@ -38,7 +38,7 @@ Feature: HUB-001 Host configuration @starts-host @docker-specific Scenario: HUB-001 TC-010 Default runner image for js/ts sequences When hub process is started with parameters "-P 9002 --instances-server-port 19002" - And sequence "../packages/inert-function.tar.gz" is loaded + And sequence "../packages/js-inert-function.tar.gz" is loaded And instance started And get runner container information Then container uses node image defined in sth-config From 33ab60b0f12ff4ea97a9e77c001718e301f38645 Mon Sep 17 00:00:00 2001 From: a-tylenda Date: Tue, 20 Feb 2024 11:33:43 +0000 Subject: [PATCH 2/2] Add script for cleaning refapps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 148726b82..b72a72681 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "clean": "yarn clean:root && scripts/run-script.js clean", "clean:root": "rm -rf ./dist/", "clean:modules": "find -name node_modules -or -name __pypackages__ -prune -exec rm -rf {} ';' 2> /dev/null", + "clean:refapps": "rm packages/*.tar.gz", "lint:full": "TIMING=1 NODE_OPTIONS=\"--max-old-space-size=3072\" eslint . --ext .ts --ext .js --cache --cache-strategy=content --cache-location=.eslintcache_scramjet-csi", "lint": "TIMING=1 NODE_OPTIONS=\"--max-old-space-size=2048\" scripts/run-script.js -w modules -j 4 -e \"! ls .eslintrc* > /dev/null || npx eslint ./ --ext .ts --ext .js --cache --cache-strategy=content\"", "lint:uncached": "find . -name .eslintcache -delete && yarn lint",