X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=2330d28f7d8ba517a5a1f472f7e6604862c3585f;hb=d371fe9f60056d0f4efd988613636869c515b02d;hp=a83d87a03d21d40f2f121c90788582ff7861dd84;hpb=70dfd9dd45be0a505c1e55b8b46bc40f6c53709d;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index a83d87a0..2330d28f 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -2,12 +2,8 @@ - job-group: name: '{project-name}-ci-jobs' - # This job group contains all the recommended jobs that should be deployed - # for any project ci. - - jjb-version: 1.6.2 - jobs: + - gerrit-jenkins-cfg-merge - gerrit-jjb-deploy-job - gerrit-jjb-merge - gerrit-jjb-verify @@ -15,38 +11,34 @@ - job-group: name: '{project-name}-github-ci-jobs' - # This job group contains all the recommended jobs that should be deployed - # for any project ci that is using github. - - jjb-version: 1.6.2 - jobs: + - github-jenkins-cfg-merge - github-jjb-deploy-job - github-jjb-merge - github-jjb-verify +- job-group: + name: '{project-name}-info-yaml-jobs' + + jobs: + - gerrit-info-yaml-verify - job-group: - name: '{project-name}-packer-jobs' + name: '{project-name}-github-info-yaml-jobs' - # This job group contains all the recommended jobs that should be deployed - # for any project ci that is using packer. + jobs: + - github-info-yaml-verify - packer-version: 1.0.2 +- job-group: + name: '{project-name}-packer-jobs' jobs: - gerrit-packer-merge - gerrit-packer-verify - - job-group: name: '{project-name}-github-packer-jobs' - # This job group contains all the recommended jobs that should be deployed - # for any project ci that is using packer. - - packer-version: 1.0.2 - jobs: - github-packer-merge - github-packer-verify @@ -72,19 +64,6 @@ - file-id: jjbini-sandbox target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini' -- lf_packer_file_paths: &lf_packer_file_paths - name: lf-packer-file-paths - file-paths: - # Common files for all projects - - compare-type: ANT - pattern: 'packer/vars/{platforms}.json' - - compare-type: ANT - pattern: 'packer/templates/{templates}.json' - - compare-type: ANT - pattern: 'packer/provision/{templates}.sh' - - compare-type: ANT - pattern: 'packer/provision/lib/**' - - lf_packer: &lf_packer_common name: lf-packer-common # Provide configuration common in packer jobs. @@ -94,10 +73,12 @@ ###################### branch: master - build-timeout: 45 + build-timeout: 90 + cron: '@monthly' stream: master submodule-recursive: true packer-cloud-settings: packer-cloud-env + packer-version: 1.2.3 ##################### # Job Configuration # @@ -117,7 +98,7 @@ stream: '{stream}' branch: '{branch}' lftools-version: '{lftools-version}' - - lf-infra-packer-parameters: + - lf-packer-parameters: packer-version: '{packer-version}' wrappers: @@ -137,7 +118,7 @@ description: Jenkins Job Builder version to download and install. - parameter: - name: lf-infra-packer-parameters + name: lf-packer-parameters parameters: - string: name: PACKER_VERSION @@ -153,16 +134,32 @@ branch: master build-timeout: 10 + jjb-version: 2.0.5 stream: master submodule-recursive: true gerrit_trigger_file_paths: - - compare-type: ANT - pattern: '**/*.sh' - - compare-type: ANT - pattern: '**/*.yaml' - - compare-type: ANT - pattern: '**/global-jjb' + - compare-type: REG_EXP + pattern: '.*\.groovy' + - compare-type: REG_EXP + pattern: '.*\.sh' + - compare-type: REG_EXP + pattern: '.*\.bat' + - compare-type: REG_EXP + pattern: '.*\.ps1' + - compare-type: REG_EXP + pattern: '.*\.(yaml|yml)' + - compare-type: REG_EXP + pattern: '.*\/global-jjb' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - '.*\.groovy' + - '.*\.sh' + - '.*\.bat' + - '.*\.ps1' + - '.*\.(yaml|yml)' + - '.*\/global-jjb' ##################### # Job Configuration # @@ -263,6 +260,154 @@ publishers: - lf-infra-publish +########################################## +# Jenkins Configuration Management Merge # +########################################## + +- builder: + name: lf-jenkins-cfg-clouds + builders: + - lf-infra-jjbini + - inject: + properties-content: 'jenkins_silos={jenkins-silos}' + - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh + - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" + +- builder: + name: lf-jenkins-cfg-global-vars + builders: + - lf-infra-jjbini + - inject: + properties-content: 'jenkins_silos={jenkins-silos}' + - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh + - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" + +- lf_jenkins_configuration: &lf_jenkins_cfg_merge + name: lf-jenkins-cfg-merge + + ###################### + # Default parameters # + ###################### + + branch: master + cron: '@daily' + git-url: '$GIT_URL/$GERRIT_PROJECT' + jenkins-silos: production sandbox + + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'jenkins-config\/.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - 'jenkins-config\/.*' + + ##################### + # Job Configuration # + ##################### + + project-type: freestyle + node: '{build-node}' + concurrent: false + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 1 + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '' + branch: master + lftools-version: '{lftools-version}' + + wrappers: + - lf-infra-wrappers: + build-timeout: 10 + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + builders: + - shell: !include-raw-escape: + - ../shell/lftools-install.sh + - lf-jenkins-cfg-global-vars: + jenkins-silos: '{jenkins-silos}' + - lf-jenkins-cfg-clouds: + jenkins-silos: '{jenkins-silos}' + + publishers: + - lf-infra-publish + +- job-template: + name: '{project-name}-jenkins-cfg-merge' + id: gerrit-jenkins-cfg-merge + <<: *lf_jenkins_cfg_merge + + scm: + - lf-infra-gerrit-scm: + git-url: '{git-url}' + refspec: 'refs/heads/{branch}' + branch: '{branch}' + submodule-recursive: true + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '{obj:cron}' + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + +- job-template: + name: '{project-name}-jenkins-cfg-merge' + id: github-jenkins-cfg-merge + <<: *lf_jenkins_cfg_merge + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 1 + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '' + branch: 'refs/heads/{branch}' + submodule-recursive: true + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '{obj:cron}' + - github + - pollscm: + cron: '' + - github-pull-request: + trigger-phrase: '^remerge$' + only-trigger-phrase: true + status-context: 'Jenkins CFG Merge' + permit-all: false + github-hooks: true + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' + ################## # JJB DEPLOY JOB # ################## @@ -270,38 +415,18 @@ - lf_jjb_deploy_job: &lf_jjb_deploy_job name: lf-jjb-deploy-job - # Deploy jobs to jenkins-sandbox system via code review comment - # - # This job checks out the current code review patch and then runs a - # `jenkins-jobs update` to push a patch defined by the comment. - # - # Comment Trigger: jjb-deploy JOB_NAME - # - # JOB_NAME can include the * wildcard character to push multiple jobs - # matching the pattern. For example `jjb-deploy builder-jjb-*`` will push - # all builder-jjb-* jobs to the sandbox system. - # - # 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: - # - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :gerrit_jjb_deploy_job_triggers: Override Gerrit Triggers. - ###################### # Default parameters # ###################### branch: master - git-url: '$GIT_URL/$GERRIT_PROJECT' + # jjb-deploy should always clone $PROJECT regardless of what + # $GERRIT_PROJECT triggered the job. + git-url: '$GIT_URL/$PROJECT' stream: master gerrit_jjb_deploy_job_triggers: - comment-added-contains-event: - comment-contains-value: jjb-deploy (?!\*+$).+$ + comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$' ##################### # Job Configuration # @@ -357,10 +482,15 @@ trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}' projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: '**' branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' + branch-pattern: '**' + skip-vote: + success: true + failed: true + unstable: true + notbuilt: true - job-template: name: '{project-name}-jjb-deploy-job' @@ -368,6 +498,9 @@ <<: *lf_jjb_deploy_job properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 1 - github: url: '{git-url}/{github-org}/{project}' @@ -375,23 +508,18 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' - branch: '{branch}' + branch: '$sha1' submodule-recursive: true choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^jjb-deploy (?!\*+$).+$' only-trigger-phrase: true status-context: 'JJB Deploy Job' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' ############# # JJB Merge # @@ -400,32 +528,6 @@ - lf_jjb_merge: &lf_jjb_merge name: lf-jjb-merge - # JJB Merge job runs `jenkins-jobs update` to update production job configuration - # - # 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) - # :mvn-settings: The name of settings file containing credentials for - # the project. - # - # 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: 10) - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :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 defined by lf_jjb_common) - ###################### # Default parameters # ###################### @@ -444,6 +546,7 @@ - shell: !include-raw-escape: - ../shell/jjb-install.sh - ../shell/jjb-merge-job.sh + - ../shell/jjb-cleanup.sh - job-template: name: '{project-name}-jjb-merge' @@ -482,7 +585,14 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_merge + ##################### + # Job Configuration # + ##################### + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 7 - github: url: '{git-url}/{github-org}/{project}' @@ -490,7 +600,7 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '' - branch: '{branch}' + branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -499,15 +609,17 @@ - github - pollscm: cron: '' - - lf-infra-github-pr-trigger: + - github-pull-request: trigger-phrase: '^remerge$' only-trigger-phrase: true status-context: 'JJB Merge' permit-all: false github-hooks: true - github-org: '{github-org}' - github_pr_whitelist: '{obj:github_pr_whitelist}' - github_pr_admin_list: '{obj:github_pr_admin_list}' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + included-regions: '{obj:github_included_regions}' ############## # JJB Verify # @@ -516,32 +628,6 @@ - lf_jjb_verify: &lf_jjb_verify name: lf-jjb-verify - # JJB Verify job runs `jenkins-jobs test` to validate JJB syntax - # - # 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) - # :mvn-settings: The name of settings file containing credentials for - # the project. - # - # 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: 10) - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :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 defined by lf_jjb_common) - ###################### # Default parameters # ###################### @@ -553,7 +639,7 @@ 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 # @@ -568,6 +654,7 @@ - ../shell/jjb-install.sh - ../shell/jjb-verify-job.sh - ../shell/jjb-check-unicode.sh + - ../shell/jjb-cleanup.sh - lf-infra-gpg-verify-git-signature - job-template: @@ -577,8 +664,16 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_verify + ###################### + # Default parameters # + ###################### + git-url: '$GIT_URL/$GERRIT_PROJECT' + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -607,7 +702,14 @@ # yamllint disable-line rule:key-duplicates <<: *lf_jjb_verify + ##################### + # Job Configuration # + ##################### + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 7 - github: url: '{git-url}/{github-org}/{project}' @@ -615,78 +717,253 @@ - 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: 'JJB Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}' -################ -# Packer Merge # -################ +################# +# License Check # +################# -- lf_packer_merge: &lf_packer_merge - name: lf-packer-merge +- lf_license_check: &lf_license_check + name: lf-license-check + + ###################### + # Default parameters # + ###################### + + branch: master + build-days-to-keep: 7 + build-timeout: 15 + file-patterns: > + *.go + *.groovy + *.java + *.py + *.sh + git-url: '$GIT_URL/$PROJECT' + lhc-version: 0.2.0 + license-exclude-paths: '' + licenses-allowed: Apache-2.0,EPL-1.0,MIT + project-pattern: '**' + spdx-disable: false + stream: master + + ##################### + # Job Configuration # + ##################### + + project-type: freestyle + node: '{build-node}' + concurrent: true + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + lftools-version: '{lftools-version}' - # Packer Merge job runs `packer build` to build system images in the cloud. - # - # 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) - # :mvn-settings: The name of settings file containing credentials for - # the project. - # :platforms: Platform or distribution to build. Typically json file - # found in the packer/vars directory. (Example: centos) - # :template: System template to build. Typically shell script found in - # the packer/provision directory. (Example: java-builder) - # - # 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: 10) - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :packer-cloud-settings: Name of settings file containing credentials - # for the cloud that packer will build on. (default: packer-cloud-env) - # :packer-version: Version of packer to install / use in build. (default: 1.0.2) - # :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. + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + builders: + - lf-license-check: + file-patterns: '{file-patterns}' + spdx-disable: '{spdx-disable}' + lhc-version: '{lhc-version}' + license-exclude-paths: '{license-exclude-paths}' + licenses-allowed: '{licenses-allowed}' + + publishers: + - lf-infra-publish + +- job-template: + name: '{project-name}-license-check' + id: gerrit-license-check + <<: *lf_license_check + + git-url: '$GIT_URL/$GERRIT_PROJECT' + + scm: + - lf-infra-gerrit-scm: + git-url: '{git-url}' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + # Submodules are out of the project's control + submodule-recursive: false + choosing-strategy: gerrit + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + # Trigger should not be overridable as we want to always run + trigger-on: + - patchset-created-event: + exclude-drafts: false + exclude-trivial-rebase: false + exclude-no-code-change: false + - draft-published-event + - comment-added-contains-event: + comment-contains-value: recheck$ + projects: + - project-compare-type: ANT + project-pattern: '{project-pattern}' + branches: + - branch-compare-type: ANT + branch-pattern: '**' + +- job-template: + name: '{project-name}-license-check' + id: github-license-check + <<: *lf_license_check + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '+refs/pull/*:refs/remotes/origin/pr/*' + branch: '$sha1' + # Submodules are out of the project's control + submodule-recursive: false + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - github-pull-request: + trigger-phrase: '^recheck$' + only-trigger-phrase: false + status-context: 'License Check' + permit-all: true + github-hooks: true + +#################### +# Info YAML Verify # +#################### + +- lf_info_yaml_verify: &lf_info_yaml_verify + name: lf-info-yaml-verify ###################### # Default parameters # ###################### - gerrit_merge_triggers: - - change-merged-event + gerrit_verify_triggers: + - patchset-created-event: + exclude-drafts: true + exclude-trivial-rebase: false + exclude-no-code-change: false + - draft-published-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + + ##################### + # Job Configuration # + ##################### + + concurrent: true + + builders: + - shell: !include-raw-escape: + - ../shell/git-validate-info-yaml.sh + - ../shell/info-file-validate.sh + +- job-template: + name: '{project-name}-info-yaml-verify' + id: gerrit-info-yaml-verify + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_info_yaml_verify + + git-url: '$GIT_URL/$GERRIT_PROJECT' + + scm: + - lf-infra-gerrit-scm: + git-url: '{git-url}' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: gerrit + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_verify_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: + - compare-type: REG_EXP + pattern: 'INFO.yaml' + +- job-template: + name: '{project-name}-info-yaml-verify' + id: github-info-yaml-verify + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_info_yaml_verify + + properties: + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '+refs/pull/*:refs/remotes/origin/pr/*' + branch: '$sha1' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - github-pull-request: + trigger-phrase: '^(recheck|reverify)$' + only-trigger-phrase: false + status-context: 'INFO File Verify' + permit-all: true + github-hooks: true + # included-regions MUST match gerrit file-paths + included-regions: 'INFO.yaml' + +################ +# Packer Merge # +################ + +- lf_packer_merge: &lf_packer_merge + name: lf-packer-merge ##################### # Job Configuration # ##################### builders: - - lf-infra-packer-validate: - packer-cloud-settings: '{packer-cloud-settings}' - packer-version: '{packer-version}' - lf-infra-packer-build: packer-cloud-settings: '{packer-cloud-settings}' packer-version: '{packer-version}' @@ -700,8 +977,21 @@ # yamllint disable-line rule:key-duplicates <<: *lf_packer_merge + ###################### + # Default parameters # + ###################### + git-url: '$GIT_URL/$GERRIT_PROJECT' + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -712,7 +1002,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - timed: '00 10 1 * *' + - timed: '{cron}' - gerrit: server-name: '{gerrit-server-name}' trigger-on: '{obj:gerrit_merge_triggers}' @@ -722,7 +1012,21 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' - <<: *lf_packer_file_paths + file-paths: + - compare-type: REG_EXP + pattern: 'packer\/provision\/.*\.sh' + - compare-type: REG_EXP + pattern: 'packer\/provision\/.*\.bat' + - compare-type: REG_EXP + pattern: 'packer\/provision\/.*\.ps1' + - compare-type: REG_EXP + pattern: 'packer\/provision\/{templates}\.yaml' + - compare-type: REG_EXP + pattern: 'packer\/provision\/local-{templates}\.yaml' + - compare-type: REG_EXP + pattern: 'packer\/templates\/{templates}\.json' + - compare-type: REG_EXP + pattern: 'packer\/vars\/{platforms}\.json' - job-template: name: '{project-name}-packer-merge-{platforms}-{templates}' @@ -731,7 +1035,14 @@ # yamllint disable-line rule:key-duplicates <<: *lf_packer_merge + ##################### + # Job Configuration # + ##################### + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 7 - github: url: '{git-url}/{github-org}/{project}' @@ -739,25 +1050,36 @@ - lf-infra-github-scm: url: '{git-clone-url}{github-org}/{project}' refspec: '' - branch: '{branch}' + branch: 'refs/heads/{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - - timed: '00 10 1 * *' + - timed: '{cron}' - github - pollscm: cron: '' - - lf-infra-github-pr-trigger: + + - github-pull-request: trigger-phrase: '^remerge$' only-trigger-phrase: true - status-context: 'Packer {platforms}-${templates} Merge' + status-context: 'Packer {platforms}-{templates} Merge' permit-all: false github-hooks: true - github-org: '{github-org}' - github_pr_whitelist: '{obj:github_pr_whitelist}' - github_pr_admin_list: '{obj:github_pr_admin_list}' + org-list: + - '{github-org}' + white-list: '{obj:github_pr_whitelist}' + admin-list: '{obj:github_pr_admin_list}' + # included-regions MUST match Gerrit Trigger file-paths + included-regions: + - 'packer\/provision\/.*\.sh' + - 'packer\/provision\/.*\.bat' + - 'packer\/provision\/.*\.ps1' + - 'packer\/provision\/{templates}\.yaml' + - 'packer\/provision\/local-{templates}\.yaml' + - 'packer\/templates\/{templates}\.json' + - 'packer\/vars\/{platforms}\.json' ################# # Packer Verify # @@ -766,34 +1088,6 @@ - lf_packer_verify: &lf_packer_verify name: lf-packer-verify - # Packer Verify job runs `packer validate` to verify packer configuration. - # - # 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) - # :mvn-settings: The name of settings file containing credentials for - # the project. - # - # 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: 10) - # :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) - # :packer-cloud-settings: Name of settings file containing credentials - # for the cloud that packer will build on. (default: packer-cloud-env) - # :packer-version: Version of packer to install / use in build. (default: 1.0.2) - # :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 parameters # ###################### @@ -807,17 +1101,15 @@ 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)$' gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'packer/vars/**.json' - - compare-type: ANT - pattern: 'packer/templates/**.json' - - compare-type: ANT - pattern: 'packer/provision/**.sh' - - compare-type: ANT - pattern: 'packer/provision/lib/**' + - compare-type: REG_EXP + pattern: 'packer\/.*' + + # github_included_regions MUST match gerrit_trigger_file_paths + github_included_regions: + - 'packer\/.*' ##################### # Job Configuration # @@ -837,8 +1129,16 @@ # yamllint disable-line rule:key-duplicates <<: *lf_packer_verify + ###################### + # Default parameters # + ###################### + git-url: '$GIT_URL/$GERRIT_PROJECT' + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -867,7 +1167,14 @@ # yamllint disable-line rule:key-duplicates <<: *lf_packer_verify + ##################### + # Job Configuration # + ##################### + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: 7 - github: url: '{git-url}/{github-org}/{project}' @@ -875,20 +1182,16 @@ - 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: 'Packer Verify' permit-all: true github-hooks: true - github-org: '' - github_pr_whitelist: - - '' - github_pr_admin_list: - - '' + included-regions: '{obj:github_included_regions}'