From 9e8d3b3d5040add588d9d0884a367a622fa3cb41 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 18 Apr 2023 08:00:14 +1000 Subject: [PATCH] Fix: Update JJB to 5.0.2 JJB's 5.0.1 has a bug that return an error when a macro is set as null. This issue is resolved in 5.0.2. TypeError: 'NoneType' object is not a mapping Issue: RELENG-4686 Change-Id: Iba6680ca7e3d54ca88b4854d9ba40006efe3f3e2 Signed-off-by: Anil Belur --- jjb/lf-ci-jobs.yaml | 2 +- releasenotes/notes/upgrade-jjb-to-502-b923f6cf518985f5.yaml | 12 ++++++++++++ tox.ini | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/upgrade-jjb-to-502-b923f6cf518985f5.yaml diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index add2505b..1dc14b2d 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -101,7 +101,7 @@ disable-job: false github-url: "https://github.com" jjb-cache: "$HOME/.cache/jenkins_jobs" - jjb-version: 5.0.1 + jjb-version: 5.0.2 stream: master submodule-recursive: true submodule-timeout: 10 diff --git a/releasenotes/notes/upgrade-jjb-to-502-b923f6cf518985f5.yaml b/releasenotes/notes/upgrade-jjb-to-502-b923f6cf518985f5.yaml new file mode 100644 index 00000000..4b81d0eb --- /dev/null +++ b/releasenotes/notes/upgrade-jjb-to-502-b923f6cf518985f5.yaml @@ -0,0 +1,12 @@ +prelude: > + JJB's 5.0.1 has a bug that return an error. + TypeError: 'NoneType' object is not a mapping +issues: + - | + This breaks the JJB test on the existing ci-man repositores when the + macro is null value. +upgrade: + - | + Upgrade Jenkins-job-builder to 5.0.2 which has the fix for the issue. + + Ref: https://review.opendev.org/c/jjb/jenkins-job-builder/+/880589 diff --git a/tox.ini b/tox.ini index 5b5b138a..2fb00fa4 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ commands = [testenv:jjb] basepython = python3 deps = - jenkins-job-builder==5.0.1 + jenkins-job-builder==5.0.2 commands = jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test @@ -103,7 +103,7 @@ commands = [testenv:jenkins-jobs] deps = - jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:5.0.1} + jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:5.0.2} commands = jenkins-jobs {posargs:--help} -- 2.16.6