X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=0749529c4003ebf525e4fac705f328d407901dda;hb=refs%2Fchanges%2F29%2F7529%2F1;hp=b0d699ac076d7c7c12d30aff3e2eb467d820ddcd;hpb=a86335269012292fa055c6274898c342f44ba29d;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index b0d699ac..0749529c 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.1 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.1 jobs: - github-packer-merge @@ -72,19 +55,6 @@ - file-id: jjbini-sandbox target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini' -- lf_packer_verify_file_paths: &lf_packer_verify_file_paths - name: lf-packer-verify-file-paths - file-paths: - # Common files for all projects - - 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/**' - - lf_packer_file_paths: &lf_packer_file_paths name: lf-packer-file-paths file-paths: @@ -166,6 +136,7 @@ branch: master build-timeout: 10 + jjb-version: 1.6.2 stream: master submodule-recursive: true @@ -283,28 +254,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 # ###################### @@ -388,7 +337,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}' @@ -413,32 +362,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 # ###################### @@ -503,7 +426,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}' @@ -529,32 +452,6 @@ - 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 # ###################### @@ -628,7 +525,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}' @@ -653,39 +550,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 # ###################### @@ -755,7 +619,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}' @@ -782,35 +646,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 # ###################### @@ -826,6 +661,16 @@ - 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 # ##################### @@ -865,7 +710,7 @@ branches: - branch-compare-type: ANT branch-pattern: '**/{branch}' - <<: *lf_packer_verify_file_paths + file-paths: '{obj:gerrit_trigger_file_paths}' - job-template: name: '{project-name}-packer-verify' @@ -882,7 +727,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}'