X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-docker-jobs.yaml;h=411fe33a756c6a27ee52bcdd2e3830493188e054;hb=6df99d7b6b5da664ff27ccb469581de5aea7f0e2;hp=0e1f1a1e44a32f43076d914cd21cb80b09dc0e66;hpb=769456c55e5b9f92fe1b8c10088bc4ac2dde79c8;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml index 0e1f1a1e..411fe33a 100644 --- a/jjb/lf-docker-jobs.yaml +++ b/jjb/lf-docker-jobs.yaml @@ -162,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 @@ -339,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}"