CI: Fix checkout-gerrit-change-action params

- Update JJB 6.3.0

Change-Id: I6f7373c948b148ae3092742f5f6b138d46f69703
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
index cd3abe23ebbf5cf5472cd934f4d2e11fb266731f..ce5b2ca107c186b30a7ea706aacaab9e846f7acf 100644 (file)
--- a/.github/workflows/gerrit-verify.yaml
+++ b/.github/workflows/gerrit-verify.yaml
@@ -74,6 +74,8 @@ jobs:
       - uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
       - name: Download actionlint
         id: get_actionlint
@@ -91,6 +93,8 @@ jobs:
       - uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
       - uses: actions/setup-python@v5
         with:
@@ -105,7 +109,10 @@ jobs:
       - uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
+          submodules: "true"
       - uses: actions/setup-python@v5
         id: setup-python
         with:
@@ -115,7 +122,7 @@ jobs:
       - name: Run JJB Verify
         run: |
           python -m pip install --upgrade pip
-          pip install jenkins-job-builder==5.1.0
+          pip install jenkins-job-builder==6.3.0
           mkdir -p "${HOME}/.config/jenkins_jobs"
           cat << EOF > "${HOME}/.config/jenkins_jobs/jenkins_jobs.ini"
           [job_builder]
@@ -135,7 +142,10 @@ jobs:
       - uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
+          submodules: "true"
       - uses: actions/setup-python@v5
         id: setup-python
         with:
@@ -153,7 +163,10 @@ jobs:
         uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
         with:
           gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-url: ${{ vars.GERRIT_URL }}
           delay: "0s"
+          submodules: "true"
       - name: Clone git submodules
         shell: bash
         run: git submodule update --init

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7a1bb1b985503a48b7ad868e276693c968f3f3f7..b8cb2f91cc73ae157bd8a3af70a40f2dd07012d2 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -27,7 +27,7 @@
     build-node: centos8-builder-2c-2g
     archive-artifacts: "**/*.log"
     build-timeout: 30
-    jjb-version: 5.0.2
+    jjb-version: 6.3.0
 
 - project:
     name: builder-openstack

diff --git a/tox.ini b/tox.ini
index 56b21b345ef15fc1e7fe789a7f26950e8c385530..b6e45fcbf5d449f88d772d0539aa905a6530075e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxi
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:5.0.2}
+    jenkins-job-builder=={env:JJB_VERSION:6.3.0}
 commands =
     jenkins-jobs {posargs:--help}
 
@@ -82,4 +82,3 @@ commands =
 # .tox folder and submodules directories global-jjb/ & packer/common-packer/ must be excluded since they are not maintained here
     find . -name *.py -not -path "./.tox/*" -not -path "./global-jjb/*" -not -path "./packer/common-packer/*" -exec \
     pylint --fail-under=6.50 --max-line-length=120 --disable=missing-docstring --disable=fixme --disable=duplicate-code \{\} +
-