X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=41eb6da60a425f5f25cdb2d4c037df706301d5d6;hb=aec2a0c78d8ca2d4ea9570cc249bbe55b33643f3;hp=46089ae7a819a9bcf61240c97b5942c81cc2d586;hpb=4d5dfa5090244aeab1b691502895467abc6e7763;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 46089ae7..41eb6da6 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,25 +11,15 @@ - 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}-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: - gerrit-packer-merge - gerrit-packer-verify @@ -42,11 +28,6 @@ - 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 @@ -75,13 +56,16 @@ - 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' + pattern: 'packer/provision/*.sh' + - compare-type: ANT + pattern: 'packer/provision/{templates}.yaml' + - compare-type: ANT + pattern: 'packer/provision/local-{templates}.yaml' - compare-type: ANT pattern: 'packer/provision/lib/**' @@ -94,10 +78,11 @@ ###################### branch: master - build-timeout: 45 + build-timeout: 90 stream: master submodule-recursive: true packer-cloud-settings: packer-cloud-env + packer-version: 1.2.2 ##################### # Job Configuration # @@ -117,7 +102,7 @@ stream: '{stream}' branch: '{branch}' lftools-version: '{lftools-version}' - - lf-infra-packer-parameters: + - lf-packer-parameters: packer-version: '{packer-version}' wrappers: @@ -137,7 +122,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,12 +138,15 @@ 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: '**/*.yml' - compare-type: ANT pattern: '**/*.yaml' - compare-type: ANT @@ -263,6 +251,146 @@ 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: ANT + pattern: '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: + - 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: '' + - lf-infra-github-pr-trigger: + trigger-phrase: '^remerge$' + only-trigger-phrase: true + status-context: 'Jenkins CFG 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 DEPLOY JOB # ################## @@ -270,28 +398,6 @@ - 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 # ###################### @@ -301,7 +407,7 @@ stream: master gerrit_jjb_deploy_job_triggers: - comment-added-contains-event: - comment-contains-value: jjb-deploy (?!\*+$).+$ + comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$' ##################### # Job Configuration # @@ -361,6 +467,11 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' + skip-vote: + success: true + failed: true + unstable: true + notbuilt: true - job-template: name: '{project-name}-jjb-deploy-job' @@ -375,7 +486,7 @@ - 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}' @@ -400,32 +511,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 # ###################### @@ -490,7 +575,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}' @@ -516,39 +601,13 @@ - 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 # ###################### gerrit_verify_triggers: - patchset-created-event: - exclude-drafts: false + exclude-drafts: true exclude-trivial-rebase: false exclude-no-code-change: false - draft-published-event @@ -615,7 +674,7 @@ - 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}' @@ -640,39 +699,6 @@ - lf_packer_merge: &lf_packer_merge name: lf-packer-merge - # 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. - # :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 # ###################### @@ -742,7 +768,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}' @@ -769,35 +795,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 defined by lf_jjb_common) - ###################### # Default parameters # ###################### @@ -806,13 +803,23 @@ gerrit_verify_triggers: - patchset-created-event: - exclude-drafts: false + exclude-drafts: true exclude-trivial-rebase: false exclude-no-code-change: false - draft-published-event - comment-added-contains-event: comment-contains-value: recheck$ + 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/**' + ##################### # Job Configuration # ##################### @@ -852,7 +859,7 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' - <<: *lf_packer_file_paths + file-paths: '{obj:gerrit_trigger_file_paths}' - job-template: name: '{project-name}-packer-verify' @@ -869,7 +876,7 @@ - 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}'