Matched new plugin template jenkins files

Author: Alexandre Landeau

Jenkinsfile

@@ -51,4 +51,4 @@ pipeline {
         }
      }
    }
-}
+}

Makefile

@@ -1,5 +1,3 @@
-SHELL:=/bin/bash
-
 # Makefile variables set automatically
 plugin_id=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['id']).replace('/',''))"`
 plugin_version=`cat plugin.json | python -c "import sys, json; print(str(json.load(sys.stdin)['version']).replace('/',''))"`
@@ -9,7 +7,7 @@ last_commit_id=`git rev-parse HEAD`
 
 
 plugin:
-	@echo "Archiving plugin to dist/ folder..."
+	@echo "[START] Archiving plugin to dist/ folder..."
 	@cat plugin.json | json_pp > /dev/null
 	@rm -rf dist
 	@mkdir dist
@@ -18,41 +16,41 @@ plugin:
 	@zip --delete dist/${archive_file_name} "tests/*"
 	@zip -u dist/${archive_file_name} release_info.json
 	@rm release_info.json
-	@echo "Archiving plugin to dist/ folder: Done!"
+	@echo "[SUCCESS] Archiving plugin to dist/ folder: Done!"
 
-.ONESHELL:
 unit-tests:
-	@set -e
 	@echo "Running unit tests..."
-	@PYTHON_VERSION=`python3 -V 2>&1 | sed 's/[^0-9]*//g' | cut -c 1,2`
-	@PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python3 -c "import sys, json; print(str($$PYTHON_VERSION) in [x[-2:] for x in json.load(sys.stdin)['acceptedPythonInterpreters']]);"`
-	@if [ $$PYTHON_VERSION_IS_CORRECT == "False" ]; then echo "Python version $$PYTHON_VERSION is not in acceptedPythonInterpreters"; exit 1; else echo "Python version $$PYTHON_VERSION is in acceptedPythonInterpreters"; fi
-	@rm -rf ./env/
-	@python3 -m venv env/
-	@source env/bin/activate
-	@pip install --upgrade pip
-	@pip install --no-cache-dir -r tests/python/unit/requirements.txt
-	@pip install --no-cache-dir -r code-env/python/spec/requirements.txt
-	@export PYTHONPATH="$(PYTHONPATH):$(PWD)/python-lib"
-	@export FONT_FOLDER_PATH="$(PWD)/resource/fonts"
-	@export STOPWORDS_FOLDER_PATH="$(PWD)/resource/stopwords"
-	@export TEST_RESOURCE_FOLDER_PATH="$(PWD)/tests/resource"
-	@pytest tests/python/unit --alluredir=tests/allure_report
-	@echo "Running unit tests: Done!"
+	@( \
+		PYTHON_VERSION=`python3 -V 2>&1 | sed 's/[^0-9]*//g' | cut -c 1,2`; \
+		PYTHON_VERSION_IS_CORRECT=`cat code-env/python/desc.json | python3 -c "import sys, json; print(str($$PYTHON_VERSION) in [x[-2:] for x in json.load(sys.stdin)['acceptedPythonInterpreters']]);"`; \
+		if [ $$PYTHON_VERSION_IS_CORRECT == "False" ]; then echo "Python version $$PYTHON_VERSION is not in acceptedPythonInterpreters"; exit 1; else echo "Python version $$PYTHON_VERSION is in acceptedPythonInterpreters"; fi; \
+	)
+	@( \
+		rm -rf ./env/; \
+		python3 -m venv env/; \
+		source env/bin/activate; \
+		pip install --upgrade pip;\
+		pip install --no-cache-dir -r tests/python/unit/requirements.txt; \
+		pip install --no-cache-dir -r code-env/python/spec/requirements.txt; \
+		export PYTHONPATH="$(PYTHONPATH):$(PWD)/python-lib"; \
+		export FONT_FOLDER_PATH="$(PWD)/resource/fonts"; \
+		export STOPWORDS_FOLDER_PATH="$(PWD)/resource/stopwords"; \
+		export TEST_RESOURCE_FOLDER_PATH="$(PWD)/tests/resource"; \
+		pytest tests/python/unit --alluredir=tests/allure_report || ret=$$?; exit $$ret \
+	)
 
-.ONESHELL:
 integration-tests:
-	@set -e
 	@echo "Running integration tests..."
-	@rm -rf ./env/
-	@python3 -m venv env/
-	@source env/bin/activate
-	@pip install --upgrade pip
-	@pip install --no-cache-dir -r tests/python/integration/requirements.txt
-	@pytest tests/python/integration --alluredir=tests/allure_report
-	@echo "Running integration tests: Done!"
+	@( \
+		rm -rf ./env/; \
+		python3 -m venv env/; \
+		source env/bin/activate; \
+		pip3 install --upgrade pip;\
+		pip install --no-cache-dir -r tests/python/integration/requirements.txt; \
+		pytest tests/python/integration --alluredir=tests/allure_report || ret=$$?; exit $$ret \
+	)
 
 tests: unit-tests integration-tests
 
 dist-clean:
-	rm -rf dist
+	rm -rf dist