X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=docs%2Fjjb%2Flf-docker-jobs.rst;h=09abbbb81d7c3ae3b4d30806f8fe689785994362;hb=9424c8da8763456069c524776357f6e6da4bed38;hp=354c77e7ad104c1292a641d7c68ef14f20698f4c;hpb=19cb59a5d60873873f6905b97266a8e919796dbc;p=releng%2Fglobal-jjb.git diff --git a/docs/jjb/lf-docker-jobs.rst b/docs/jjb/lf-docker-jobs.rst index 354c77e7..09abbbb8 100644 --- a/docs/jjb/lf-docker-jobs.rst +++ b/docs/jjb/lf-docker-jobs.rst @@ -27,7 +27,8 @@ If container-tag-method: yaml-file, the tag is obtained using the yq command, which requires that the repository has a YAML file named 'container-tag.yaml'. The script checks the docker-root directory by default or the directory specified by parameter container-tag-yaml-dir. -An example file appears below. +An example file appears below. Optionally, teams can call their own script to +handle the docker tagging differently. lf-docker-build @@ -55,7 +56,7 @@ Executes a docker build task. - github-docker-verify :Comment Trigger: **recheck|reverify** post a comment with one of the - triggers to launch this job manually. Do not include any additional + triggers to launch this job manually. Do not include any other text or vote in the same comment. :Required parameters: @@ -79,6 +80,8 @@ Executes a docker build task. (default: latest) :container-tag-yaml-dir: Directory with container-tag.yaml. (default: $DOCKER_ROOT) :docker-build-args: Additional arguments for the docker build command. + :docker-get-container-tag-script: Pointer to script to handle docker tags. + (default: ../shell/docker-get-container-tag.sh) :docker-root: Build directory within the repo. (default: $WORKSPACE, the repo root) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) :pre_docker_build_script: Build script to execute before the main verify @@ -119,7 +122,7 @@ Executes a docker build task and publishes the resulting images to a specified D - github-docker-merge :Comment Trigger: **remerge** post a comment with the trigger to launch - this job manually. Do not include any additional text or vote in the + this job manually. Do not include any other text or vote in the same comment. :Required parameters: @@ -148,6 +151,8 @@ Executes a docker build task and publishes the resulting images to a specified D 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-get-container-tag-script: Pointer to script to handle docker tags. + (default: ../shell/docker-get-container-tag.sh) :docker-root: Build directory within the repo. (default: $WORKSPACE, the repo root) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) :pre_docker_build_script: Build script to execute before the main merge