Chore!: Rename 'whitelist' to 'allowlist'

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

diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml
index 1f9635c..411fe33 100644 (file)
--- a/jjb/lf-docker-jobs.yaml
+++ b/jjb/lf-docker-jobs.yaml
@@ -13,8 +13,7 @@
             CONTAINER_TAG_METHOD={container-tag-method}
             CONTAINER_TAG_YAML_DIR={container-tag-yaml-dir}
             DOCKER_ROOT={docker-root}
-      - shell: !include-raw-escape:
-          - ../shell/docker-get-container-tag.sh
+      - shell: !include-raw: "{docker-get-container-tag-script}"
       - inject:
           # Import the container tag set by this build step
           properties-file: "env_docker_inject.txt"
@@ -64,6 +63,7 @@
     pre_docker_build_script: "# pre docker build script goes here"
     post_docker_build_script: "# post docker build script goes here"
     disable-job: "false"
+    docker-get-container-tag-script: "../shell/docker-get-container-tag.sh"
     docker-root: "$WORKSPACE"
     docker-build-args: ""
     git-url: "$GIT_URL/$PROJECT"
@@ -139,6 +139,7 @@
           container-tag-method: "{container-tag-method}"
           container-tag-yaml-dir: "{container-tag-yaml-dir}"
           docker-root: "{docker-root}"
+          docker-get-container-tag-script: "{docker-get-container-tag-script}"
       - lf-docker-build:
           docker-build-args: "{docker-build-args}"
           docker-name: "{docker-name}"
@@ -150,7 +151,7 @@
 
 - docker_merge_common: &docker_merge_common
     name: docker-merge-common
-    cron: ""
+    cron: "@weekly" # check dependencies regularly
 
     scm:
       - lf-infra-gerrit-scm:
@@ -161,7 +162,7 @@
           submodule-disable: "{submodule-disable}"
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
-          choosing-strategy: gerrit
+          choosing-strategy: default
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -186,6 +187,7 @@
           container-tag-method: "{container-tag-method}"
           container-tag-yaml-dir: "{container-tag-yaml-dir}"
           docker-root: "{docker-root}"
+          docker-get-container-tag-script: "{docker-get-container-tag-script}"
       - lf-docker-build:
           docker-build-args: "{docker-build-args}"
           docker-name: "{docker-name}"
@@ -337,7 +339,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}"
           white-list-target-branches:
             - "{branch}"