X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=a221135c237b01e6c5da9dcc7e9306140b2896e2;hb=04ddcaa1631de196b5aac96215318d7dee70d0e1;hp=6a3b6b12112be6a420b938f64dbc7827917c37b3;hpb=851b0b6d0cfe84e986548fd596a9b2f18413fefd;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 6a3b6b12..a221135c 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -8,8 +8,21 @@ jjb-version: 1.6.2 jobs: - - '{project-name}-jjb-merge' - - '{project-name}-jjb-verify' + - gerrit-jjb-merge + - gerrit-jjb-verify + +- 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-jjb-merge' + - 'github-jjb-verify' + #################### # Anchors & Macros # @@ -31,6 +44,25 @@ - compare-type: ANT pattern: '**/*.yaml' +- 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 + - parameter: name: lf-infra-jjb-parameters parameters: @@ -43,8 +75,10 @@ # Job Templates # ################# -- job-template: - name: '{project-name}-jjb-merge' +# 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}' @@ -53,6 +87,7 @@ # Default parameters # ###################### + stream: master branch: master submodule-recursive: true @@ -68,21 +103,43 @@ parameters: - lf-infra-parameters: project: '{project}' + stream: '{stream}' branch: '{branch}' - lf-infra-jjb-parameters: jjb-version: '{jjb-version}' + wrappers: + - lf-infra-wrappers: + build-timeout: 10 + 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 + + ###################### + # Default parameters # + ###################### + + git-url: '$GIT_URL/$GERRIT_PROJECT' + + ##################### + # Job Configuration # + ##################### + scm: - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' refspec: '' branch: '{branch}' submodule-recursive: '{submodule-recursive}' choosing-strategy: default - - wrappers: - - lf-infra-wrappers: - build-timeout: 10 jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: @@ -91,7 +148,7 @@ trigger-on: - change-merged-event - comment-added-contains-event: - comment-contains-value: ^remerge$ + comment-contains-value: remerge$ projects: - project-compare-type: ANT project-pattern: '{project}' @@ -100,58 +157,33 @@ branch-pattern: '**/{branch}' <<: *lf_jjb_file_paths - builders: - - lf-infra-jjbini - - shell: !include-raw-escape: - - ../shell/jjb-install.sh - - ../shell/jjb-merge-job.sh - - publishers: - - lf-infra-publish - - job-template: name: '{project-name}-jjb-verify' - project-type: freestyle - - node: '{build-node}' + id: gerrit-jjb-verify concurrent: true + <<: *lf_jjb_verify_merge + # yamllint disable-line rule:key-duplicates + <<: *lf_jjb_verify_builders ###################### # Default parameters # ###################### - branch: master - submodule-recursive: true + git-url: '$GIT_URL/$GERRIT_PROJECT' ##################### # Job Configuration # ##################### - properties: - - lf-infra-properties: - project: '{project}' - build-days-to-keep: 7 - - parameters: - - lf-infra-parameters: - project: '{project}' - branch: '{branch}' - - lf-infra-jjb-parameters: - jjb-version: '{jjb-version}' - 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}' - wrappers: - - lf-infra-wrappers: - build-timeout: 10 - jenkins-ssh-credential: '{jenkins-ssh-credential}' - triggers: - gerrit: server-name: '{gerrit-server-name}' @@ -162,7 +194,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: ^recheck$ + comment-contains-value: recheck$ projects: - project-compare-type: ANT project-pattern: '{project}' @@ -171,13 +203,74 @@ branch-pattern: '**/{branch}' <<: *lf_jjb_file_paths - builders: - - lf-infra-jjbini - - shell: !include-raw-escape: - - ../shell/jjb-install.sh - - ../shell/jjb-verify-job.sh - - ../shell/jjb-check-unicode.sh - - gpg-verify-git-signature +- 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 - publishers: - - lf-infra-publish + ##################### + # 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: '' + - github-pull-request: + trigger-phrase: '^remerge$' + only-trigger-phrase: true + status-context: 'JJB Merge' + permit-all: false + github-hooks: true + auto-close-on-fail: false + org-list: + - '{github-org}' + +- job-template: + name: '{project-name}-jjb-verify' + id: github-jjb-verify + concurrent: true + <<: *lf_jjb_verify_merge + # yamllint disable-line rule:key-duplicates + <<: *lf_jjb_verify_builders + + ##################### + # Job Configuration # + ##################### + + 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: '{branch}' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: default + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - github-pull-request: + trigger-phrase: '^recheck$' + only-trigger-phrase: false + status-context: 'JJB Verify' + permit-all: true + github-hooks: true + auto-close-on-fail: false