X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=d498aff90bb835f83f8874ec333a68873602f2a9;hb=687da407d7dd30b7d6414c6cca4038f17f8bc69b;hp=e0aee7239cbbc45f2e758cb1b3d2b969bdeab704;hpb=76eab87ffe09d31e67744b01e67336c5f3a6ac86;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index e0aee723..d498aff9 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: @@ -83,25 +82,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. @@ -111,6 +91,7 @@ ###################### build-timeout: 45 + packer-cloud-settings: packer-cloud-env wrappers: - lf-infra-wrappers: @@ -122,27 +103,10 @@ project: '{project}' stream: '{stream}' branch: '{branch}' + lftools-version: '{lftools-version}' - 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. - builders: - - lf-infra-packer-validate: - packer-version: '{packer-version}' - - lf-infra-packer-build: - platform: '{platforms}' - template: '{templates}' - packer-version: '{packer-version}' - -- lf_packer_verify_builders: &lf_packer_verify_builders - # Adds builders section common to verify packer jobs. - name: lf-packer-verify-builders - builders: - - lf-infra-packer-validate: - packer-version: '{packer-version}' - - parameter: name: lf-infra-jjb-parameters parameters: @@ -159,15 +123,8 @@ 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 +- lf_jjb_common: &lf_jjb_common + name: lf-jjb-common project-type: freestyle node: '{build-node}' @@ -194,6 +151,7 @@ project: '{project}' stream: '{stream}' branch: '{branch}' + lftools-version: '{lftools-version}' - lf-infra-jjb-parameters: jjb-version: '{jjb-version}' @@ -205,10 +163,22 @@ publishers: - lf-infra-publish +############# +# JJB Merge # +############# + +- 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 + - job-template: name: '{project-name}-jjb-merge' id: gerrit-jjb-merge - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_jjb_merge_builders @@ -218,6 +188,11 @@ git-url: '$GIT_URL/$GERRIT_PROJECT' + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + ##################### # Job Configuration # ##################### @@ -234,56 +209,7 @@ triggers: - gerrit: server-name: '{gerrit-server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: remerge$ - projects: - - project-compare-type: ANT - project-pattern: '{project}' - branches: - - branch-compare-type: ANT - branch-pattern: '**/{branch}' - <<: *lf_jjb_file_paths - -- job-template: - name: '{project-name}-jjb-verify' - id: gerrit-jjb-verify - concurrent: true - <<: *lf_jjb_verify_merge - # yamllint disable-line rule:key-duplicates - <<: *lf_jjb_verify_builders - - ###################### - # Default parameters # - ###################### - - git-url: '$GIT_URL/$GERRIT_PROJECT' - - ##################### - # Job Configuration # - ##################### - - 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: - - 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$ + trigger-on: '{obj:gerrit_merge_triggers}' projects: - project-compare-type: ANT project-pattern: '{project}' @@ -295,7 +221,7 @@ - job-template: name: '{project-name}-jjb-merge' id: github-jjb-merge - <<: *lf_jjb_verify_merge + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_jjb_merge_builders @@ -330,11 +256,74 @@ github_pr_whitelist: '{obj:github_pr_whitelist}' github_pr_admin_list: '{obj:github_pr_admin_list}' +############## +# JJB Verify # +############## + +- 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 + +- job-template: + name: '{project-name}-jjb-verify' + id: gerrit-jjb-verify + concurrent: true + <<: *lf_jjb_common + # yamllint disable-line rule:key-duplicates + <<: *lf_jjb_verify_builders + + ###################### + # Default parameters # + ###################### + + git-url: '$GIT_URL/$GERRIT_PROJECT' + + gerrit_verify_triggers: + - 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$ + + ##################### + # Job Configuration # + ##################### + + 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}' + <<: *lf_jjb_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 @@ -368,67 +357,53 @@ github_pr_admin_list: - '' -- job-template: - name: '{project-name}-packer-merge-{platforms}-{templates}' - id: gerrit-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 +################ +# Packer Merge # +################ - ###################### - # Default parameters # - ###################### - - git-url: '$GIT_URL/$GERRIT_PROJECT' - - ##################### - # Job Configuration # - ##################### +- lf_packer_merge_builders: &lf_packer_merge_builders + name: lf-packer-merge-builders - 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}' + # 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. - triggers: - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: remerge$ - projects: - - project-compare-type: ANT - project-pattern: '{project}' - branches: - - branch-compare-type: ANT - branch-pattern: '**/{branch}' - <<: *lf_packer_file_paths + 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-verify' - id: gerrit-packer-verify + 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 - <<: *lf_packer_verify_builders + <<: *lf_packer_merge_builders ###################### # Default parameters # ###################### - build-timeout: 10 git-url: '$GIT_URL/$GERRIT_PROJECT' + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + ##################### # Job Configuration # ##################### @@ -443,16 +418,10 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: + - timed: '00 10 1 * *' - gerrit: server-name: '{gerrit-server-name}' - 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$ + trigger-on: '{obj:gerrit_merge_triggers}' projects: - project-compare-type: ANT project-pattern: '{project}' @@ -461,12 +430,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 + <<: *lf_jjb_common # yamllint disable-line rule:key-duplicates <<: *lf_packer_common # yamllint disable-line rule:key-duplicates @@ -490,6 +458,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: + - timed: '00 10 1 * *' - github - pollscm: cron: '' @@ -503,11 +472,81 @@ 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_common + # yamllint disable-line rule:key-duplicates + <<: *lf_packer_common + # yamllint disable-line rule:key-duplicates + <<: *lf_packer_verify_builders + + ###################### + # Default parameters # + ###################### + + build-timeout: 10 + git-url: '$GIT_URL/$GERRIT_PROJECT' + + gerrit_verify_triggers: + - 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$ + + ##################### + # Job Configuration # + ##################### + + 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}' + <<: *lf_packer_file_paths + - 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