Chore!: Rename 'whitelist' to 'allowlist'

[releng/global-jjb.git] / jjb / lf-ci-jobs.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0ae94d8..7759168 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -387,7 +387,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
@@ -670,7 +670,7 @@
                 - branch-compare-type: ANT
                   branch-pattern: "**"
           skip-vote:
-            success: true
+            successful: true
             failed: true
             unstable: true
             notbuilt: true
@@ -814,7 +814,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
@@ -1616,7 +1616,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           # included-regions MUST match Gerrit Trigger file-paths
           included-regions:
@@ -2164,6 +2164,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    sonarcloud-java-version: openjdk11
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -2219,6 +2220,8 @@
     name: lf-sonar-builders
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - lf-infra-sonar:
           sonar-task: "{sonar-task}"
           sonar-project-file: "{sonar-project-file}"
@@ -2230,6 +2233,8 @@
     name: lf-sonar-builders-prescan
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - lf-infra-sonar-with-prescan:
           sonar-task: "{sonar-task}"
           sonar-project-file: "{sonar-project-file}"
@@ -2241,6 +2246,8 @@
     name: lf-sonar-builders-prescan-script
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - shell: "{sonar-prescan-script}"
       - lf-infra-sonar:
           sonar-task: "{sonar-task}"