From 6e38694a114eac53f7b8e2dbe45f8296c560be4d Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 30 Jan 2024 18:13:00 +0100 Subject: [PATCH] ci: the order of `--allow-empty-variables` for `jenkins-jobs` is important Jenkins Jobs Builder fails like this, indicating the order of the parameters is important: ``` $ jenkins-jobs update --allow-empty-variables --delete-old jobs usage: jenkins-jobs [-h] [--conf CONF] [-l LOG_LEVEL] [--ignore-cache] [--flush-cache] [--version] [--allow-empty-variables] [--server SECTION] [--user USER] [--password PASSWORD] {delete,delete-all,get-plugins-info,list,test,update} ... jenkins-jobs: error: unrecognized arguments: --allow-empty-variables ``` Signed-off-by: Niels de Vos --- deploy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/Makefile b/deploy/Makefile index 2a1fe7938..936f31565 100644 --- a/deploy/Makefile +++ b/deploy/Makefile @@ -2,7 +2,7 @@ WORKDIR ?= $(CURDIR)/../ OUTPUT ?= $(WORKDIR)/_output/ test: - cd $(WORKDIR) && jenkins-jobs test --allow-empty-variables -o $(OUTPUT) jobs + cd $(WORKDIR) && jenkins-jobs --allow-empty-variables test -o $(OUTPUT) jobs deploy: - cd $(WORKDIR) && jenkins-jobs update --allow-empty-variables --delete-old jobs + cd $(WORKDIR) && jenkins-jobs --allow-empty-variables update --delete-old jobs