X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=24a1e1581893c4ce1ca23314558783b6bddd22c9;hb=a480891885b83c778dd82761eaa332cfc4d838f0;hp=74eaee0c4baa364c0989da846bedd02aae2a6aec;hpb=724167b0fc12efba132bed0033ef1d98d68d940f;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 74eaee0c..24a1e158 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 # @@ -47,7 +60,7 @@ - ../shell/jjb-install.sh - ../shell/jjb-verify-job.sh - ../shell/jjb-check-unicode.sh - - gpg-verify-git-signature + - lf-infra-gpg-verify-git-signature - parameter: name: lf-infra-jjb-parameters @@ -102,17 +115,29 @@ - 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 + jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: - gerrit: @@ -131,13 +156,25 @@ - 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}' @@ -162,3 +199,75 @@ - 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: '' + - 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