Skip to content

Commit

Permalink
Feat!: Upgrade Jenkins-job-builder to 6x
Browse files Browse the repository at this point in the history 
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.

Note: This breaks backward compatibility with older version of JJB
therefore care must be taken when upgrading the ci-man repositories.

Ref:
https://storyboard.openstack.org/#!/story/2010963
https://storyboard.openstack.org/#!/story/2010588

Issue: LF-JIRA RELENG-5182
Change-Id: Ib9acd0b9e7c264ac3531af858431e738397833b5
Signed-off-by: Anil Belur <[email protected]>
  • Loading branch information
@askb @vvalderrv
askb authored and vvalderrv committed Mar 21, 2024
1 parent 487315d commit cbe4988
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 24 deletions.
2 changes: 1 addition & 1 deletion extras/bash/sandbox_test_functions.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

jjb-sandbox-env()
{
local jjb_version=${JJB_VERSION:-"5.0.2"}
local jjb_version=${JJB_VERSION:-"6.0.0"}

if [ -z "$WS_ROOT" ] ; then
echo "ERROR: WS_ROOT is not set!"
Expand Down
2 changes: 1 addition & 1 deletion global-jjb
Submodule global-jjb updated 25 files
+18 −32 .github/workflows/gerrit-verify.yaml
+1 −1 .github/workflows/release.yaml
+3 −0 .gitignore
+5 −5 .pre-commit-config.yaml
+39 −1 README.md
+1 −1 docs/conf.py
+1 −1 docs/jjb/lf-gradle-jobs.rst
+1 −1 jjb/lf-ci-jobs.yaml
+9 −9 jjb/lf-macros.yaml
+17 −5 jjb/lf-maven-jobs.yaml
+11 −0 releasenotes/notes/fix-exclusion-pattern-format-ac269302cfb781d8.yaml
+4 −0 releasenotes/notes/fix-missing-tox-dep-d416344f5a0a0195.yaml
+4 −0 releasenotes/notes/fix-shellcheck-errors-04d1683561e9ecc9.yaml
+6 −0 releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml
+4 −0 releasenotes/notes/update-actions-96667de09c4a1c70.yaml
+24 −0 releasenotes/notes/upgrade-jjb-6x-00f29f4ed84cedce.yaml
+5 −0 releasenotes/notes/view-name-bug-jjb-6x-d5dd611244c0de0c.yaml
+15 −0 releasenotes/notes/workaround-fix-exclusion-pattern-format-1a034b6d3d0508e5.yaml
+1 −1 requirements.txt
+1 −1 shell/jenkins-sandbox-cleanup.sh
+0 −3 shell/openstack-cleanup-old-images.sh
+2 −2 shell/openstack-cleanup-orphaned-objects.sh
+0 −1 shell/python-tools-install.sh
+7 −7 shell/release-job.sh
+10 −4 tox.ini
2 changes: 1 addition & 1 deletion jjb/ci-management/ci-management-jobs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
project-name: ci-management
build-node: centos8-builder-2c-2g
build-timeout: 15
jjb-version: 5.0.2
jjb-version: 6.0.0

- project:
name: ci-management
Expand Down
27 changes: 18 additions & 9 deletions jjb/csit/csit-perf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -979,7 +980,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1067,7 +1069,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1213,7 +1216,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1298,7 +1302,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1383,7 +1388,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1468,7 +1474,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1553,7 +1560,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down Expand Up @@ -1638,7 +1646,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-perf-trial-duration-parameter:
Expand Down
3 changes: 2 additions & 1 deletion jjb/csit/csit-tox.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'

scm:
- gerrit-trigger-scm:
Expand Down
6 changes: 4 additions & 2 deletions jjb/csit/csit-vpp-device.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- csit-fail-on-crc-mismatch-parameter:
Expand Down Expand Up @@ -122,7 +123,8 @@
make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- gerrit-refspec-parameter
- gerrit-refspec-parameter:
refspec: '$GERRIT_REFSPEC'
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
# This is an automatic verify job, part of API coverage.
Expand Down
18 changes: 9 additions & 9 deletions jjb/global-macros.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,8 @@
- SUCCESS
- UNSTABLE
build-steps:
- shell: !include-raw: scripts/post_build_executor_info.sh
- shell: !include-raw: scripts/post_build_deploy_archives.sh
- shell: !include-raw-escape: scripts/post_build_executor_info.sh
- shell: !include-raw-escape: scripts/post_build_deploy_archives.sh
- fdio-infra-ship-logs
mark-unstable-if-failed: true
- workspace-cleanup:
Expand Down Expand Up @@ -931,9 +931,9 @@
files:
- file-id: "jenkins-s3-docs-ship"
target: $HOME/.aws/credentials
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/terraform_s3_docs_ship.sh
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/publish_docs.sh
- shell: !include-raw:
- ../global-jjb/shell/logs-clear-credentials.sh
Expand All @@ -945,9 +945,9 @@
files:
- file-id: "jenkins-s3-vpp-docs-ship"
target: $HOME/.aws/credentials
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/terraform_s3_docs_ship.sh
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/publish_cov.sh
- shell: !include-raw:
- ../global-jjb/shell/logs-clear-credentials.sh
Expand All @@ -959,9 +959,9 @@
files:
- file-id: "jenkins-s3-vpp-docs-ship"
target: $HOME/.aws/credentials
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/terraform_s3_docs_ship.sh
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/publish_docs.sh
- shell: !include-raw:
- ../global-jjb/shell/logs-clear-credentials.sh
Expand All @@ -973,7 +973,7 @@
files:
- file-id: "jenkins-s3-log-ship"
target: $HOME/.aws/credentials
- shell: !include-raw:
- shell: !include-raw-escape:
- scripts/publish_library_py.sh
- shell: !include-raw:
- scripts/publish_logs.sh
Expand Down

0 comments on commit cbe4988

Please sign in to comment.