From b75709c89b4b5c85628ad6680718567c614b1215 Mon Sep 17 00:00:00 2001 From: Christopher Grebs Date: Thu, 11 Oct 2018 10:35:46 +0200 Subject: [PATCH] Attempt at fixing 'assets' job. Let's just remove the manual `update_assets` call and document that whenever it get's changed / updated the appropriate pytest tests should be adapted too. That way we only run it once and potentially fix our unstable 'assets' job. Fixes #9656 --- Makefile-docker | 1 + tox.ini | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile-docker b/Makefile-docker index 7674fc1ee8..313f6ae037 100644 --- a/Makefile-docker +++ b/Makefile-docker @@ -138,6 +138,7 @@ update_db: schematic src/olympia/migrations update_assets: + # If changing this here, make sure to adapt tests in amo/test_commands.py python manage.py compress_assets python manage.py collectstatic --noinput diff --git a/tox.ini b/tox.ini index ee59866463..1ced47b1cb 100644 --- a/tox.ini +++ b/tox.ini @@ -76,7 +76,6 @@ commands = commands = make -f Makefile-docker update_deps pytest -m "static_assets" --ignore=tests/ui/ -v src/olympia/ {posargs} - make -f Makefile-docker update_assets [testenv:codestyle] recreate = True