From 132555485c636fb26f70d709539c13ea28fd4fc9 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 7 Oct 2019 14:49:13 -0400 Subject: [PATCH] Add targets for combined lint and test Reduce the total number of simultaneous zuul jobs. --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index bc621224fa..9fd0fd3db4 100644 --- a/Makefile +++ b/Makefile @@ -544,6 +544,12 @@ jshint: $(UI_DEPS_FLAG_FILE) $(NPM_BIN) run --prefix awx/ui jshint $(NPM_BIN) run --prefix awx/ui lint +ui-zuul-lint-and-test: $(UI_DEPS_FLAG_FILE) + $(NPM_BIN) run --prefix awx/ui jshint + $(NPM_BIN) run --prefix awx/ui lint + $(NPM_BIN) --prefix awx/ui run test:ci + $(NPM_BIN) --prefix awx/ui run unit + # END UI TASKS # -------------------------------------- @@ -559,6 +565,12 @@ ui-next-test: $(NPM_BIN) --prefix awx/ui_next install $(NPM_BIN) run --prefix awx/ui_next test +ui-next-zuul-lint-and-test: + $(NPM_BIN) --prefix awx/ui_next install + $(NPM_BIN) run --prefix awx/ui_next lint + $(NPM_BIN) run --prefix awx/ui_next prettier-check + $(NPM_BIN) run --prefix awx/ui_next test + # END UI NEXT TASKS # --------------------------------------