X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=6d5d01a47840b3bc07684d8f224422dcf4a9dc68;hb=64e510a02d5c8530eda9be1d771789eedcbe895f;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..6d5d01a4 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -2,11 +2,6 @@ - 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-jjb-deploy-job - gerrit-jjb-merge @@ -15,24 +10,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-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 + packer-version: 1.1.3 jobs: - gerrit-packer-merge @@ -42,10 +28,7 @@ - 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 + packer-version: 1.1.3 jobs: - github-packer-merge @@ -75,13 +58,14 @@ - 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/lib/**' @@ -94,7 +78,7 @@ ###################### branch: master - build-timeout: 45 + build-timeout: 90 stream: master submodule-recursive: true packer-cloud-settings: packer-cloud-env @@ -153,6 +137,7 @@ branch: master build-timeout: 10 + jjb-version: 1.6.2 stream: master submodule-recursive: true @@ -270,28 +255,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 # ###################### @@ -375,7 +338,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 +363,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 +427,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 +453,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 +526,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 +551,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 +620,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 +647,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 +655,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 +711,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 +728,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}'