X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-rtd-jobs.yaml;h=16409187bfd56e4af77b98a16d0e3ac1106f4037;hb=9cb04c8a479acc4e67891bdf425c62afae7445fa;hp=9feaec198a186144074477639a0f0db002ca9a86;hpb=c2494ace391aec04f864667454ce8573cc39ad3b;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 9feaec19..16409187 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -2,8 +2,6 @@ - job-group: name: '{project-name}-rtd-jobs' - # This job group contains all the ReadTheDocs jobs - jobs: - gerrit-rtd-merge - gerrit-rtd-verify @@ -11,8 +9,6 @@ - job-group: name: '{project-name}-github-rtd-jobs' - # This job group contains all the ReadTheDocs jobs - jobs: - github-rtd-merge - github-rtd-verify @@ -23,18 +19,27 @@ - lf_rtd_common: &lf_rtd_common name: lf-rtd-common - # RTD verify and merge jobs are the same except for their scm, trigger, and - # builders definition. This anchor is the common template. ###################### # Default parameters # ###################### gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**/*.rst' - - compare-type: ANT - pattern: '**/conf.py' + - compare-type: REG_EXP + pattern: '.*\.css' + - compare-type: REG_EXP + pattern: '.*\.html' + - compare-type: REG_EXP + pattern: '.*\.rst' + - compare-type: REG_EXP + pattern: '.*\/conf.py' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*\.css' + - '.*\.html' + - '.*\.rst' + - '.*\/conf.py' ##################### # Job Configuration # @@ -70,35 +75,6 @@ - lf_rtd_merge: &lf_rtd_merge name: lf-rtd-merge - # Merge job which triggers a POST of the docs project to readthedocs - # - # Required parameters: - # - # :build-node: The node to run build on. - # :jenkins-ssh-credential: Credential to use for SSH. (Generally should - # be configured in defaults.yaml) - # :rtd-project: This is the name of the project on ReadTheDocs.org. - # - # Optional parameters: - # - # :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 seconds before aborting build. (default: 15) - # :git-url: base URL of git project. (default: https://github.com) - # :project-pattern: Project to trigger build against. (default: **) - # :stream: Keyword that can be used to represent a release code-name. - # Often the same as the branch. (default: master) - # :submodule-recursive: Whether to checkout submodules recursively. - # (default: true) - # - # :gerrit_merge_triggers: Override Gerrit Triggers. - # :gerrit_trigger_file_paths: Override file paths which can be used to - # filter which file modifications will trigger a build. - # (default: - compare-type: ANT - # pattern: '**/*.rst' - # - compare-type: ANT - # pattern: '**/conf.py') - ###################### # Default parameters # ###################### @@ -106,7 +82,9 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false git-url: https://github.com + github-url: 'https://github.com' project-pattern: '**' stream: master submodule-recursive: true @@ -120,9 +98,12 @@ # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-rtd-trigger-build: - rtd-project: '{rtd-project}' + rtd-build-url: '{rtd-build-url}' + rtd-token: '{rtd-token}' - job-template: name: '{project-name}-rtd-merge-{stream}' @@ -151,22 +132,29 @@ <<: *lf_rtd_merge properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' - github: - url: '{git-url}/{github-org}/{project}' + url: '{github-url}/{github-org}/{project}' triggers: - - lf-infra-github-pr-trigger: + - timed: 'H H * * *' + - github + - pollscm: + cron: '' + - github-pull-request: trigger-phrase: '^remerge$' - only-trigger-phrase: false + only-trigger-phrase: true status-context: 'RTD Merge' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' - - timed: 'H H * * *' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' + white-list-target-branches: + - '{branch}' ############# # RTD VERIFY# @@ -174,36 +162,6 @@ - lf_rtd_verify: &lf_rtd_verify name: lf-rtd-verify - # Verify job which runs a tox build of the docs project - # - # Required Parameters: - # - # :build-node: The node to run build on. - # :jenkins-ssh-credential: Credential to use for SSH. (Generally should - # be configured in defaults.yaml) - # - # Optional Parameters: - # - # :branch: Git branch to fetch for the build. (default: master) - # :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) - # :build-node: The node to run build on. - # :build-timeout: Timeout in seconds before aborting build. (default: 15) - # :doc-dir: Directory where tox will place built docs. - # as defined in the tox.ini (default: docs/_build/html) - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :project-pattern: Project to trigger build against. (default: **) - # :stream: Keyword that can be used to represent a release code-name. - # Often the same as the branch. (default: master) - # :submodule-recursive: Whether to checkout submodules recursively. - # (default: true) - # - # :gerrit_verify_triggers: Override Gerrit Triggers. - # :gerrit_trigger_file_paths: Override file paths which can be used to - # filter which file modifications will trigger a build. - # (default: - compare-type: ANT - # pattern: '**/*.rst' - # - compare-type: ANT - # pattern: '**/conf.py') ###################### # Default parameters # @@ -212,8 +170,10 @@ branch: master build-days-to-keep: 7 build-timeout: 15 + disable-job: false doc-dir: docs/_build/html git-url: '$GIT_URL/$PROJECT' + github-url: 'https://github.com' project-pattern: '**' stream: master submodule-recursive: true @@ -225,12 +185,14 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # ##################### + disabled: '{disable-job}' + builders: - lf-rtd-verify: doc-dir: '{doc-dir}' @@ -245,10 +207,10 @@ scm: - lf-infra-gerrit-scm: - branch: '{branch}' + branch: '$GERRIT_BRANCH' jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}' - refspec: '' + refspec: '' # Leave blank!! A later script will handle fetching submodule-recursive: '{submodule-recursive}' choosing-strategy: default @@ -273,27 +235,27 @@ <<: *lf_rtd_verify properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' - github: - url: '{git-url}/{github-org}/{project}' + url: '{github-url}/{github-org}/{project}' scm: - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: - trigger-phrase: '^recheck$' + - github-pull-request: + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'RTD Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}' + white-list-target-branches: + - '{branch}'