From efce69317c6b74c8f3f5c869efed5bc4f533dd7c Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 7 Feb 2024 13:05:28 +1000 Subject: 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-ID: CIMAN-33 LF-JIRA RELENG-5131 Change-Id: Icdeecb8bf216ceab4c5af5720f3bd89d3ef2621d Signed-off-by: Anil Belur --- jjb/integration/integration-macros.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jjb/integration/integration-macros.yaml') diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 5e9099908..a101a71b4 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -40,7 +40,7 @@ - builder: name: integration-install-robotframework-py3 builders: - - shell: !include-raw: + - shell: !include-raw-escape: - include-raw-integration-install-robotframework-py3.sh - builder: @@ -48,13 +48,13 @@ builders: - shell: | git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management - cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE} - ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS} + cp /tmp/ci-management/jjb/integration/*csit.sh "$WORKSPACE" + "$WORKSPACE/run-csit.sh" "$TESTPLAN" "$TESTOPTIONS" - builder: name: integration-run-project-test builders: - - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}" + - shell: "$WORKSPACE/csit/run-project-csit.sh $TESTOPTIONS" - builder: name: integration-autorelease-fix-relativepaths -- cgit 1.2.3-korg