From: Eric Ball <eball@linuxfoundation.org>
Date: Mon, 12 Feb 2024 18:19:02 +0000 (+0000)
Subject: Merge "Docs: Quick links to guides"
X-Git-Tag: v0.90.1~9
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=102e26f3cdf33fd6433740604b162c491b123d3c;hp=ac796a19f092da05eebe08e6b068aae30a5f840d;p=releng%2Fglobal-jjb.git

Merge "Docs: Quick links to guides"
---

diff --git a/docs/jjb/lf-python-jobs.rst b/docs/jjb/lf-python-jobs.rst
index d7553ec4..5df0e26b 100644
--- a/docs/jjb/lf-python-jobs.rst
+++ b/docs/jjb/lf-python-jobs.rst
@@ -446,6 +446,7 @@ Plug-in configurations
     :disable-job: Whether to disable the job (default: false)
     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
     :github-url: URL for Github. (default: https://github.com)
+    :java-version: JDK version to use. (default: openjdk17)
     :parallel: If different from false, try pass this parameter to tox option
         "--parallel" to parallelize jobs in the envlist (and then activate the
         option "--parallel-live" to display output in logs).
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 20b20114..cd95e701 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.4
+    jjb-version: 6.0.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 3ceda0d1..4032c5f4 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -22,7 +22,7 @@
 - builder:
     name: lf-fetch-dependent-patches
     builders:
-      - shell: !include-raw: ../shell/gerrit-fetch-dependencies.sh
+      - shell: !include-raw-escape: ../shell/gerrit-fetch-dependencies.sh
       - inject:
           properties-file: $WORKSPACE/.dependency.properties
 
@@ -42,7 +42,7 @@
 - builder:
     name: lf-infra-capture-instance-metadata
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/capture-instance-metadata.sh
 
 - builder:
@@ -100,11 +100,11 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../shell/python-tools-install.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/sudo-logs.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/job-cost.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/logs-deploy.sh
       - shell: !include-raw:
           - ../shell/logs-clear-credentials.sh
@@ -114,7 +114,7 @@
 - builder:
     name: lf-infra-package-listing
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/package-listing.sh
 
 - builder:
@@ -179,7 +179,7 @@
 - builder:
     name: lf-infra-update-packer-images
     builders:
-      - shell: !include-raw: ../shell/update-cloud-images.sh
+      - shell: !include-raw-escape: ../shell/update-cloud-images.sh
 
 - builder:
     name: lf-infra-push-gerrit-patch
@@ -197,7 +197,7 @@
 - builder:
     name: lf-infra-sysstat
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/sysstat.sh
 
 - builder:
@@ -343,7 +343,7 @@
           files:
             - file-id: lftoolsini
               target: "$HOME/.config/lftools/lftools.ini"
-      - shell: !include-raw: ../shell/release-job.sh
+      - shell: !include-raw-escape: ../shell/release-job.sh
 
 - builder:
     name: lf-sigul-sign-dir
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index f2693d4b..aba6b9b7 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -17,7 +17,7 @@
 - builder:
     name: lf-maven-deploy
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-deploy.sh
 
diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 4eb134b1..18268ebc 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -779,6 +779,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    java-version: openjdk17
     parallel: false
     pre-build-script: "# pre-build script goes here"
     python-version: python3
@@ -828,6 +829,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - lf-infra-tox-install:
           python-version: "{python-version}"
       - shell: "{pre-build-script}"
diff --git a/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml b/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml
new file mode 100644
index 00000000..96c0df70
--- /dev/null
+++ b/releasenotes/notes/pin-jjb-5.1.0-0a3cc6b5511c447d.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+  A new version of JJB 6.x is released which breaks backword compatibility.
+fixes:
+  - |
+    Pin global-jjb to 5.1.0 until the codebase is moved to JJB 6x.
+
+    https://groups.google.com/g/jenkins-job-builder/c/miYGnWgYZYM
diff --git a/releasenotes/notes/update-sonarqube-java-alternatives-e85ec6a90aa2a99e.yaml b/releasenotes/notes/update-sonarqube-java-alternatives-e85ec6a90aa2a99e.yaml
new file mode 100644
index 00000000..e820ff14
--- /dev/null
+++ b/releasenotes/notes/update-sonarqube-java-alternatives-e85ec6a90aa2a99e.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Add Java update alternatives step to allow users to use a different Java
+    version for their Sonarqube builds.
diff --git a/releasenotes/notes/upgrade-jjb-6x-00f29f4ed84cedce.yaml b/releasenotes/notes/upgrade-jjb-6x-00f29f4ed84cedce.yaml
new file mode 100644
index 00000000..347f1bca
--- /dev/null
+++ b/releasenotes/notes/upgrade-jjb-6x-00f29f4ed84cedce.yaml
@@ -0,0 +1,24 @@
+---
+prelude: >
+  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.
+issues:
+  - |
+    This breaks backward compatibility with older version of JJB
+    therefore care must be taken during upgrade on the ci-man repositories.
+upgrade:
+  - |
+    Upgrade Jenkins-job-builder to 6.0.0 as the default version.
+
+    Ref:
+      https://storyboard.openstack.org/#!/story/2010963
+      https://storyboard.openstack.org/#!/story/2010588
diff --git a/tox.ini b/tox.ini
index bd167508..91332c12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands =
 [testenv:jjb]
 basepython = python3
 deps =
-    jenkins-job-builder==5.0.4
+    jenkins-job-builder==6.0.0
 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.4}
+    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:6.0.0}
 commands =
     jenkins-jobs {posargs:--help}