From 43094c459398b7a2d848760b326efb2f92c9fd45 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 7 Feb 2024 19:49:29 +1000 Subject: [PATCH] Feat!: Update JJB version to 6x Jenkins Job Builder 6.0.0 is released and breaks backward compatibility with 5.1.0. The breaking changes with previous 5.1.0 release: - Jobs are now expanded the same way as job templates. - Macros without parameters are now expanded the same way as macros with parameters. - Tags !include-raw: and !include-raw-escape: should now be used the same way in jobs and macros without parameters as they are used in job templates and macros with parameters. - Update pre-commit dependencies Ref: https://storyboard.openstack.org/#!/story/2010963 https://storyboard.openstack.org/#!/story/2010588 NOTE: Set the var "JJB_VERSION" to "6.0.0" at the GH orginazation level for GHA JJB Verify to pick up the latest version of JJB. Issue: LF-JIRA RELENG-5119 Signed-off-by: Anil Belur Change-Id: Ifaff7de14e36e703110d32bfaba0af6cb6c3b4fb --- .pre-commit-config.yaml | 10 +++++----- global-jjb | 2 +- tox.ini | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea2aa9f6..cfceb847 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,25 +4,25 @@ default_language_version: node: "14.13.0" repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.5.0 hooks: - id: check-json - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.6.2 + rev: v4.0.0-alpha.8 hooks: - id: prettier stages: [commit] - repo: https://github.com/jorisroovers/gitlint - rev: v0.17.0 + rev: v0.19.1 hooks: - id: gitlint stages: [commit-msg] - repo: https://github.com/jumanjihouse/pre-commit-hooks - rev: 2.1.6 + rev: 3.0.0 hooks: - id: shellcheck exclude: > @@ -33,6 +33,6 @@ repos: )$ - repo: https://github.com/adrienverge/yamllint - rev: v1.26.3 + rev: v1.34.0 hooks: - id: yamllint diff --git a/global-jjb b/global-jjb index 766dbef8..5d336574 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 766dbef8a63d824d6e551d4f179806521be95d13 +Subproject commit 5d336574e77fb349ace15356ef8ffb816d463544 diff --git a/tox.ini b/tox.ini index 56241b11..72ca6499 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ skipsdist = true [testenv:jenkins-jobs] deps = - jenkins-job-builder=={env:JJB_VERSION:5.0.2} + jenkins-job-builder=={env:JJB_VERSION:5.1.0} commands = jenkins-jobs {posargs:--help} -- 2.16.6