From b64ed081a0e57c3b4f74947d48a1c226a1a6b54f Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Mon, 3 Jun 2019 10:12:12 -0400 Subject: [PATCH] Add trigger-on-cron to docker merge job Signed-off-by: Lott, Christopher (cl778h) Change-Id: I6e1d46d3b4e10a5e694201aeb493a4ef152ee954 --- docs/jjb/lf-docker-jobs.rst | 4 ++++ jjb/lf-docker-jobs.yaml | 3 +++ .../notes/add-trigger-cron-docker-merge-job-275c34c971c738d1.yaml | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 releasenotes/notes/add-trigger-cron-docker-merge-job-275c34c971c738d1.yaml diff --git a/docs/jjb/lf-docker-jobs.rst b/docs/jjb/lf-docker-jobs.rst index fd231958..b661f527 100644 --- a/docs/jjb/lf-docker-jobs.rst +++ b/docs/jjb/lf-docker-jobs.rst @@ -125,6 +125,10 @@ Executes a docker build task and publishes the resulting images to a specified D :branch: Git branch to fetch for the build. (default: master) :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) :build-timeout: Timeout in minutes before aborting build. (default: 60) + :cron: Cron schedule when to trigger the job. This parameter also + supports multiline input via YAML pipe | character in cases where + one may want to provide more than 1 cron timer. No default. Use + '@daily' to run daily or 'H H * * 0' to run weekly. :docker-build-args: Additional arguments for the docker build command. :docker-root: Path of the Dockerfile within the repo. :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml index ec870b6d..d4d265a4 100644 --- a/jjb/lf-docker-jobs.yaml +++ b/jjb/lf-docker-jobs.yaml @@ -158,6 +158,7 @@ - docker_merge_common: &docker_merge_common name: docker-merge-common + cron: '' scm: - lf-infra-gerrit-scm: @@ -289,6 +290,7 @@ <<: *docker_merge_common triggers: + - timed: '{obj:cron}' - gerrit: server-name: '{gerrit-server-name}' trigger-on: '{obj:gerrit_merge_triggers}' @@ -330,6 +332,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: + - timed: '{obj:cron}' - github - pollscm: cron: '' diff --git a/releasenotes/notes/add-trigger-cron-docker-merge-job-275c34c971c738d1.yaml b/releasenotes/notes/add-trigger-cron-docker-merge-job-275c34c971c738d1.yaml new file mode 100644 index 00000000..0e05699b --- /dev/null +++ b/releasenotes/notes/add-trigger-cron-docker-merge-job-275c34c971c738d1.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Add trigger on cron to docker merge macro to support regular rebuilds. + This makes the merge macro match the behavior of most other jobs. -- 2.16.6