Fix: Ignore unbounded variable BUILD_RESULT

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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 36965c8..abe3564 100644 (file)
--- 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: 2.8.0
+    jjb-version: 4.1.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -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:
@@ -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:
@@ -1372,6 +1372,12 @@
       - lf-infra-pre-build
       - inject:
           properties-content: OS_CLOUD={openstack-cloud}
+      # K8s Clusters
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{openstack-stack-cleanup}"
+          steps:
+            - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-k8s-clusters.sh
       # Stacks
       - conditional-step:
           condition-kind: boolean-expression
@@ -1616,7 +1622,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: