Move Aether jobs to scrape that Jenkins
Include tox, add junit/cobertura output to tests
Change-Id: Ie8a251ae11c33b24eec18d1c02db22294879dcad
diff --git a/Makefile b/Makefile
index 2edb1a2..504d6b3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
COMMON_ARGS ?= --debug
# tooling binaries
-VIRTUALENV ?= virtualenv -p python3
+VIRTUALENV ?= python3 -m venv
PYTHON ?= python3
# change to be 'python3 -m cProfile -s cumtime' to profile a script
@@ -15,7 +15,7 @@
.PHONY: test lint yamllint license help build siterender buildcollector sync
# Create the virtualenv with all the tools installed
-VENV_NAME = venv_sjsg
+VENV_NAME = venv-sjsg
$(VENV_NAME): requirements.txt
$(VIRTUALENV) $@ ;\
@@ -24,14 +24,12 @@
echo "To enter virtualenv, run 'source $@/bin/activate'"
# build targets
-
products:
mkdir products
site:
mkdir site
-
build: buildcollector siterender ## Collect build info and create website
buildcollector: $(VENV_NAME) products ## Collect build information from Jenkins jobs
@@ -53,7 +51,7 @@
test: yamllint tox ## run all tests
# YAML files, excluding venv and cookiecutter directories
-YAML_FILES ?= $(shell find . -type d \( -path "./venv_sjsc" \) -prune -o -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
+YAML_FILES ?= $(shell find . -type d \( -path "./venv-sjsg" \) -prune -o -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
yamllint: $(VENV_NAME) ## lint YAML format using yamllint
source ./$</bin/activate ; set -u ;\
@@ -62,14 +60,15 @@
-d "{extends: default, rules: {line-length: {max: 139}}}" \
-s $(YAML_FILES)
-tox: ## test code with tox
- tox
+tox: $(VENV_NAME) ## test code with tox
+ source ./$</bin/activate ; set -u ;\
+ tox
license: ## Check code for licensing with REUSE
reuse --root . lint
clean: ## Delete all temporary files
- rm -rf products site
+ rm -rf products site *.xml *.egg-info
clean-all: clean ## Delete virtualenv and all cached job information
rm -rf $(VENV_NAME) jobs .tox