Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I6e1d46d3b4e10a5e694201aeb493a4ef152ee954
: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)
: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)
: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)
- docker_merge_common: &docker_merge_common
name: docker-merge-common
- docker_merge_common: &docker_merge_common
name: docker-merge-common
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
<<: *docker_merge_common
triggers:
<<: *docker_merge_common
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
trigger-on: '{obj:gerrit_merge_triggers}'
- gerrit:
server-name: '{gerrit-server-name}'
trigger-on: '{obj:gerrit_merge_triggers}'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- github
- pollscm:
cron: ''
- github
- pollscm:
cron: ''
--- /dev/null
+---
+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.