Subdivided e2e recipe with more steps

Author: pcrespov

.github/workflows/ci-testing-deploy.yml

@@ -1058,6 +1058,8 @@ jobs:
             ${{ runner.os }}-node-
       - name: setup images
         run: ./ci/github/system-testing/e2e.bash setup_images
+      - name: setup and start swarm
+        run: ./ci/github/system-testing/e2e.bash setup_and_run_stack
       - name: setup environment
         run: ./ci/github/system-testing/e2e.bash setup_environment
       - name: setup registry
@@ -1070,7 +1072,7 @@ jobs:
       - name: recover docker logs
         id: logs_recovery
         if: always()
-        run: ./ci/github/system-testing/e2e.bash recover_artifacts
+        run: ./ci/github/system-testing/e2e.bash dump_docker_logs
       - name: upload docker logs
         if: always()
         uses: actions/upload-artifact@v2

ci/github/system-testing/e2e.bash

@@ -74,13 +74,17 @@ uninstall_insecure_registry() {
 }
 
 setup_images() {
-  echo "--------------- getting simcore docker images..."
+  echo "--------------- preparing docker images..."
   make pull-version || ( (make pull-cache || true) && make build-x tag-version)
   make info-images
 
+}
+
+setup_and_run_stack() {
   # configure simcore for testing with a private registry
   install_insecure_registry
 
+  echo "--------------- starting swarm ..."
   # start simcore and set log-level
   export LOG_LEVEL=WARNING
   make up-version
@@ -135,29 +139,32 @@ setup_database() {
 install() {
   ## shortcut
   setup_images
+  setup_and_run_stack
   setup_environment
   setup_registry
   setup_database
 }
 
 test() {
+  sleep 5
   pushd tests/e2e
   make test
   popd
-
 }
 
-recover_artifacts() {
+dump_docker_logs() {
   # all screenshots are in tests/e2e/screenshots if any
 
   # get docker logs.
   # NOTE: dumping logs sometimes hangs. Introducing a timeout
-  mkdir simcore_logs
+  mkdir --parents simcore_logs
   (timeout 30 docker service logs --timestamps --tail=300 --details ${SWARM_STACK_NAME}_webserver >simcore_logs/webserver.log 2>&1) || true
   (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_director  >simcore_logs/director.log 2>&1) || true
   (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_storage   >simcore_logs/storage.log 2>&1) || true
   (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_sidecar   >simcore_logs/sidecar.log 2>&1) || true
   (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_catalog   >simcore_logs/catalog.log 2>&1) || true
+  (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_migration >simcore_logs/migration.log 2>&1) || true
+  (timeout 30 docker service logs --timestamps --tail=200 --details ${SWARM_STACK_NAME}_postgres >simcore_logs/postgres.log 2>&1) || true
 }
 
 clean_up() {

tests/e2e/Makefile

@@ -41,17 +41,17 @@ registry-down: ## bring the docker registry down
 wait-for-services: ## wait for simcore services to be up
 	@python utils/wait_for_services.py
 
+
 .PHONY: transfer-images-to-registry
 transfer-images-to-registry: ## transfer images to registry
+	# pushing sleeper image
 	@docker pull itisfoundation/sleeper:1.0.0
 	@docker tag itisfoundation/sleeper:1.0.0 registry:5000/simcore/services/comp/itis/sleeper:1.0.0
 	@docker push registry:5000/simcore/services/comp/itis/sleeper:1.0.0
-
-	# @docker pull itisfoundation/jupyter-base-notebook:2.13.0
-	# @docker tag itisfoundation/jupyter-base-notebook:2.13.0 registry:5000/simcore/services/dynamic/jupyter-base-notebook:2.13.0
-	# @docker push registry:5000/simcore/services/dynamic/jupyter-base-notebook:2.13.0
 	# completed transfer of images
 	curl -s registry:5000/v2/_catalog | jq '.repositories'
+	curl -s http://registry:5000/v2/simcore/services/comp/itis/sleeper/tags/list?n=50 | jq '.'
+
 
 PUBLISHED_PORT = $(shell docker inspect $(shell docker service ls --format "{{ .Name }}" | grep postgres) --format "{{(index .Endpoint.Ports 0).PublishedPort}}")
 .PHONY: inject-templates-in-db
@@ -64,8 +64,9 @@ inject-templates-in-db: ## inject project templates
 		--dbname simcoredb \
 		--command "\copy projects from 'tutorials/sleepers_project_template_sql.csv' csv header;";
 
+
 .PHONY: test
-test: ## test the platform
+test: ## test the platformå
 	# tests
 	npm test
 	# tests whether tutorial run