X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-docker-jobs.yaml;h=95bfa4b8f1e6e9012d934221f24a76c10269fbac;hb=bee1d1152f7fd19e81ef23344011541d1d66a091;hp=bc522ca2e73209b07a5a3802b1a233c5e64363e3;hpb=4f69d87cabcbd08da63baf6a4ba205a8ce9fdd38;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml index bc522ca2..95bfa4b8 100644 --- a/jjb/lf-docker-jobs.yaml +++ b/jjb/lf-docker-jobs.yaml @@ -13,7 +13,7 @@ CONTAINER_TAG_METHOD={container-tag-method} CONTAINER_TAG_YAML_DIR={container-tag-yaml-dir} DOCKER_ROOT={docker-root} - - shell: !include-raw-escape: "{docker-get-container-tag-script}" + - shell: !include-raw: "{docker-get-container-tag-script}" - inject: # Import the container tag set by this build step properties-file: "env_docker_inject.txt" @@ -151,7 +151,7 @@ - docker_merge_common: &docker_merge_common name: docker-merge-common - cron: "" + cron: "@weekly" # check dependencies regularly scm: - lf-infra-gerrit-scm: @@ -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