X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=115ba6c79f80b6d19e2da9a3d66aeb0000a2f6e5;hb=refs%2Fchanges%2F96%2F5896%2F2;hp=c130f26c7133467393c0f73b54530f13ddf24e4a;hpb=c9d4074e828ab8d5a8455bc43059f6584708c76c;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index c130f26c..115ba6c7 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -49,9 +49,8 @@ - github-packer-merge - github-packer-verify - #################### -# Anchors & Macros # +# COMMON FUNCTIONS # #################### - builder: @@ -62,14 +61,6 @@ - file-id: jjbini target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini' -- lf_jjb_file_paths: &lf_jjb_file_paths - name: lf-jjb-file-paths - file-paths: - - compare-type: ANT - pattern: '**/*.sh' - - compare-type: ANT - pattern: '**/*.yaml' - - lf_packer_file_paths: &lf_packer_file_paths name: lf-packer-file-paths file-paths: @@ -83,25 +74,6 @@ - compare-type: ANT pattern: 'packer/provision/lib/**' -- lf_jjb_merge_builders: &lf_jjb_merge_builders - name: lf-jjb-merge-builders - builders: - - lf-infra-jjbini - - shell: !include-raw-escape: - - ../shell/jjb-install.sh - - ../shell/jjb-merge-job.sh - -- lf_jjb_verify_builders: &lf_jjb_verify_builders - name: lf-jjb-verfy-builders - builders: - - lf-infra-jjbini - - shell: !include-raw-escape: - - ../shell/git-validate-jira-urls.sh - - ../shell/jjb-install.sh - - ../shell/jjb-verify-job.sh - - ../shell/jjb-check-unicode.sh - - lf-infra-gpg-verify-git-signature - - lf_packer: &lf_packer_common name: lf-packer-common # Adds wrappers and parameters sections common to packer jobs. @@ -126,39 +98,6 @@ - lf-infra-packer-parameters: packer-version: '{packer-version}' -- lf_packer_merge_builders: &lf_packer_merge_builders - name: lf-packer-merge-builders - # Adds builders section common to merge packer jobs. - # {packer-cloud-settings} is passed from the project, defines the managed - # file-id name created in Jenkins - # (default: packer-cloud-env) - # {packer-version}: is global defined in job group level, the version number - # can be updated to install the latest version of packer. - # {platforms}: defines the packer platform file, passed from the project. - # {template}: defines the packer template file, passed from the project. - 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}' - platform: '{platforms}' - template: '{templates}' - -- lf_packer_verify_builders: &lf_packer_verify_builders - # Adds builders section common to verify packer jobs. - # {packer-cloud-settings} is passed from the project, defines the managed - # file-id name created in Jenkins - # (default: packer-cloud-env) - # {packer-version}: is global defined in job group level, the version number - # can be updated to install the latest version of packer. - name: lf-packer-verify-builders - builders: - - lf-infra-packer-validate: - packer-cloud-settings: '{packer-cloud-settings}' - packer-version: '{packer-version}' - - parameter: name: lf-infra-jjb-parameters parameters: @@ -175,31 +114,33 @@ default: '{packer-version}' description: Packer version to download and install. - -################# -# Job Templates # -################# - -# JJB verify and merge jobs are the same except for their scm, trigger, and -# builders definition. This anchor is the common template -- lf_jjb_verify_merge: &lf_jjb_verify_merge - name: lf-jjb-verify-merge - project-type: freestyle - - node: '{build-node}' +- lf_jjb_common: &lf_jjb_common + name: lf-jjb-common ###################### # Default parameters # ###################### - stream: master branch: master + build-timeout: 10 + 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' + ##################### # Job Configuration # ##################### + project-type: freestyle + node: '{build-node}' + properties: - lf-infra-properties: project: '{project}' @@ -215,25 +156,49 @@ wrappers: - lf-infra-wrappers: - build-timeout: 10 + build-timeout: '{build-timeout}' jenkins-ssh-credential: '{jenkins-ssh-credential}' publishers: - lf-infra-publish -- job-template: - name: '{project-name}-jjb-merge' - id: gerrit-jjb-merge - <<: *lf_jjb_verify_merge - # yamllint disable-line rule:key-duplicates - <<: *lf_jjb_merge_builders +############# +# JJB Merge # +############# + +- 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 # ###################### - git-url: '$GIT_URL/$GERRIT_PROJECT' - gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: @@ -243,6 +208,21 @@ # Job Configuration # ##################### + builders: + - lf-infra-jjbini + - shell: !include-raw-escape: + - ../shell/jjb-install.sh + - ../shell/jjb-merge-job.sh + +- job-template: + name: '{project-name}-jjb-merge' + id: gerrit-jjb-merge + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_jjb_merge + + git-url: '$GIT_URL/$GERRIT_PROJECT' + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -262,22 +242,79 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' - <<: *lf_jjb_file_paths + file-paths: '{obj:gerrit_trigger_file_paths}' - job-template: - name: '{project-name}-jjb-verify' - id: gerrit-jjb-verify - concurrent: true - <<: *lf_jjb_verify_merge + name: '{project-name}-jjb-merge' + id: github-jjb-merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates - <<: *lf_jjb_verify_builders + <<: *lf_jjb_merge + + properties: + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '' + branch: '{branch}' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - github + - pollscm: + cron: '' + - lf-infra-github-pr-trigger: + 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}' + +############## +# JJB Verify # +############## + +- 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 # ###################### - git-url: '$GIT_URL/$GERRIT_PROJECT' - gerrit_verify_triggers: - patchset-created-event: exclude-drafts: false @@ -291,6 +328,26 @@ # Job Configuration # ##################### + concurrent: true + + builders: + - lf-infra-jjbini + - shell: !include-raw-escape: + - ../shell/git-validate-jira-urls.sh + - ../shell/jjb-install.sh + - ../shell/jjb-verify-job.sh + - ../shell/jjb-check-unicode.sh + - lf-infra-gpg-verify-git-signature + +- job-template: + name: '{project-name}-jjb-verify' + id: gerrit-jjb-verify + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_jjb_verify + + git-url: '$GIT_URL/$GERRIT_PROJECT' + scm: - lf-infra-gerrit-scm: git-url: '{git-url}' @@ -310,57 +367,14 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' - <<: *lf_jjb_file_paths - -- job-template: - name: '{project-name}-jjb-merge' - id: github-jjb-merge - <<: *lf_jjb_verify_merge - # yamllint disable-line rule:key-duplicates - <<: *lf_jjb_merge_builders - - ##################### - # Job Configuration # - ##################### - - properties: - - github: - url: '{git-url}/{github-org}/{project}' - - scm: - - lf-infra-github-scm: - url: '{git-clone-url}{github-org}/{project}' - refspec: '' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - choosing-strategy: default - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - github - - pollscm: - cron: '' - - lf-infra-github-pr-trigger: - 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}' + file-paths: '{obj:gerrit_trigger_file_paths}' - job-template: name: '{project-name}-jjb-verify' id: github-jjb-verify - concurrent: true - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates - <<: *lf_jjb_verify_builders - - ##################### - # Job Configuration # - ##################### + <<: *lf_jjb_verify properties: - github: @@ -388,11 +402,37 @@ github_pr_admin_list: - '' +################ +# Packer Merge # +################ + +- lf_packer_merge_builders: &lf_packer_merge_builders + name: lf-packer-merge-builders + + # Adds builders section common to merge packer jobs. + # {packer-cloud-settings} is passed from the project, defines the managed + # file-id name created in Jenkins + # (default: packer-cloud-env) + # {packer-version}: is global defined in job group level, the version number + # can be updated to install the latest version of packer. + # {platforms}: defines the packer platform file, passed from the project. + # {template}: defines the packer template file, passed from the project. + + 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}' + platform: '{platforms}' + template: '{templates}' + - job-template: name: '{project-name}-packer-merge-{platforms}-{templates}' id: gerrit-packer-merge concurrent: true - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_packer_common # yamllint disable-line rule:key-duplicates @@ -435,11 +475,72 @@ branch-pattern: '**/{branch}' <<: *lf_packer_file_paths +- job-template: + name: '{project-name}-packer-merge-{platforms}-{templates}' + id: github-packer-merge + concurrent: true + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_packer_common + # yamllint disable-line rule:key-duplicates + <<: *lf_packer_merge_builders + + ##################### + # Job Configuration # + ##################### + + properties: + - github: + url: '{git-url}/{github-org}/{project}' + + scm: + - lf-infra-github-scm: + url: '{git-clone-url}{github-org}/{project}' + refspec: '' + branch: '{branch}' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '00 10 1 * *' + - github + - pollscm: + cron: '' + - lf-infra-github-pr-trigger: + trigger-phrase: '^remerge$' + only-trigger-phrase: true + 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}' + +################# +# Packer Verify # +################# + +- lf_packer_verify_builders: &lf_packer_verify_builders + name: lf-packer-verify-builders + + # Adds builders section common to verify packer jobs. + # {packer-cloud-settings} is passed from the project, defines the managed + # file-id name created in Jenkins + # (default: packer-cloud-env) + # {packer-version}: is global defined in job group level, the version number + # can be updated to install the latest version of packer. + + builders: + - lf-infra-packer-validate: + packer-cloud-settings: '{packer-cloud-settings}' + packer-version: '{packer-version}' + - job-template: name: '{project-name}-packer-verify' id: gerrit-packer-verify concurrent: true - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_packer_common # yamllint disable-line rule:key-duplicates @@ -486,54 +587,11 @@ branch-pattern: '**/{branch}' <<: *lf_packer_file_paths - -- job-template: - name: '{project-name}-packer-merge-{platforms}-{templates}' - id: github-packer-merge - concurrent: true - <<: *lf_jjb_verify_merge - # yamllint disable-line rule:key-duplicates - <<: *lf_packer_common - # yamllint disable-line rule:key-duplicates - <<: *lf_packer_merge_builders - - ##################### - # Job Configuration # - ##################### - - properties: - - github: - url: '{git-url}/{github-org}/{project}' - - scm: - - lf-infra-github-scm: - url: '{git-clone-url}{github-org}/{project}' - refspec: '' - branch: '{branch}' - submodule-recursive: '{submodule-recursive}' - choosing-strategy: default - jenkins-ssh-credential: '{jenkins-ssh-credential}' - - triggers: - - timed: '00 10 1 * *' - - github - - pollscm: - cron: '' - - lf-infra-github-pr-trigger: - trigger-phrase: '^remerge$' - only-trigger-phrase: true - 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}' - - job-template: name: '{project-name}-packer-verify' id: github-packer-verify concurrent: true - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_packer_common # yamllint disable-line rule:key-duplicates