Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add view templates to manage Jenkins views"
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
e9e483e
..
638716e
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-36,6
+36,7
@@
github-url: 'https://github.com'
stream: master
submodule-recursive: true
github-url: 'https://github.com'
stream: master
submodule-recursive: true
+ submodule-timeout: 10
packer-cloud-settings: packer-cloud-env
packer-version: 1.2.5
packer-cloud-settings: packer-cloud-env
packer-version: 1.2.5
@@
-99,29
+100,21
@@
jjb-version: 2.2.1
stream: master
submodule-recursive: true
jjb-version: 2.2.1
stream: master
submodule-recursive: true
+ submodule-timeout: 10
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: '
.*\.groovy
'
+ pattern: '
jjb/.*
'
- compare-type: REG_EXP
- compare-type: REG_EXP
- pattern: '
.*\.sh
'
+ pattern: '
global-jjb
'
- compare-type: REG_EXP
- compare-type: REG_EXP
- pattern: '.*\.bat'
- - compare-type: REG_EXP
- pattern: '.*\.ps1'
- - compare-type: REG_EXP
- pattern: '.*\.(yaml|yml)'
- - compare-type: REG_EXP
- pattern: '.*\/global-jjb'
+ pattern: 'shell/.*'
# github_included_regions MUST match gerrit_trigger_file_paths
github_included_regions:
# github_included_regions MUST match gerrit_trigger_file_paths
github_included_regions:
- - '.*\.groovy'
- - '.*\.sh'
- - '.*\.bat'
- - '.*\.ps1'
- - '.*\.(yaml|yml)'
- - '.*\/global-jjb'
+ - 'jjb/.*'
+ - 'global-jjb'
+ - 'shell/.*'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-169,6
+162,7
@@
disable-job: false
git-url: '$GIT_URL/$GERRIT_PROJECT'
stream: master
disable-job: false
git-url: '$GIT_URL/$GERRIT_PROJECT'
stream: master
+ submodule-timeout: 10
gerrit_merge_triggers:
- comment-added-contains-event:
comment-contains-value: (un)?lock branch$
gerrit_merge_triggers:
- comment-added-contains-event:
comment-contains-value: (un)?lock branch$
@@
-204,6
+198,7
@@
refspec: ''
branch: '{branch}'
submodule-recursive: false
refspec: ''
branch: '{branch}'
submodule-recursive: false
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-236,7
+231,7
@@
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
- 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"
+ - shell: rm
-f
"$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- builder:
name: lf-jenkins-cfg-global-vars
- builder:
name: lf-jenkins-cfg-global-vars
@@
-245,7
+240,7
@@
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
- 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"
+ - shell: rm
-f
"$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- lf_jenkins_configuration: &lf_jenkins_cfg_merge
name: lf-jenkins-cfg-merge
- lf_jenkins_configuration: &lf_jenkins_cfg_merge
name: lf-jenkins-cfg-merge
@@
-260,6
+255,7
@@
git-url: '$GIT_URL/$GERRIT_PROJECT'
github-url: 'https://github.com'
jenkins-silos: production sandbox
git-url: '$GIT_URL/$GERRIT_PROJECT'
github-url: 'https://github.com'
jenkins-silos: production sandbox
+ submodule-timeout: 10
gerrit_merge_triggers:
- change-merged-event
gerrit_merge_triggers:
- change-merged-event
@@
-301,8
+297,7
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
- - shell: !include-raw-escape:
- - ../shell/lftools-install.sh
+ - lf-infra-pre-build
- lf-jenkins-cfg-global-vars:
jenkins-silos: '{jenkins-silos}'
- lf-jenkins-cfg-clouds:
- lf-jenkins-cfg-global-vars:
jenkins-silos: '{jenkins-silos}'
- lf-jenkins-cfg-clouds:
@@
-322,6
+317,7
@@
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-356,6
+352,7
@@
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: true
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-451,6
+448,7
@@
git-url: '$GIT_URL/$PROJECT'
github-url: 'https://github.com'
stream: master
git-url: '$GIT_URL/$PROJECT'
github-url: 'https://github.com'
stream: master
+ submodule-timeout: 10
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
@@
-501,6
+499,7
@@
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-538,6
+537,7
@@
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: true
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-572,6
+572,7
@@
#####################
builders:
#####################
builders:
+ - lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
@@
-593,6
+594,7
@@
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-632,6
+634,7
@@
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-680,6
+683,7
@@
concurrent: true
builders:
concurrent: true
builders:
+ - lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/git-validate-jira-urls.sh
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/git-validate-jira-urls.sh
@@
-712,6
+716,7
@@
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-751,6
+756,7
@@
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-780,7
+786,7
@@
builders:
- shell: |
builders:
- shell: |
- cd
jjb/
global-jjb
+ cd global-jjb
git fetch https://gerrit.linuxfoundation.org/infra/releng/global-jjb $GERRIT_REFSPEC
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
git fetch https://gerrit.linuxfoundation.org/infra/releng/global-jjb $GERRIT_REFSPEC
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
@@
-804,6
+810,7
@@
######################
git-url: '$GIT_URL/$PROJECT'
######################
git-url: '$GIT_URL/$PROJECT'
+ submodule-timeout: 10
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-815,6
+822,7
@@
refspec: ''
branch: 'master'
submodule-recursive: true
refspec: ''
branch: 'master'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-870,6
+878,7
@@
project-pattern: '**'
spdx-disable: false
stream: master
project-pattern: '**'
spdx-disable: false
stream: master
+ submodule-timeout: 10
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-921,6
+930,7
@@
branch: '$GERRIT_BRANCH'
# Submodules are out of the project's control
submodule-recursive: false
branch: '$GERRIT_BRANCH'
# Submodules are out of the project's control
submodule-recursive: false
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-961,6
+971,7
@@
branch: '$sha1'
# Submodules are out of the project's control
submodule-recursive: false
branch: '$sha1'
# Submodules are out of the project's control
submodule-recursive: false
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1020,6
+1031,7
@@
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1055,6
+1067,7
@@
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1090,6
+1103,7
@@
github-url: 'https://github.com'
openstack-cloud: vex
stream: master
github-url: 'https://github.com'
openstack-cloud: vex
stream: master
+ submodule-timeout: 10
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1148,6
+1162,7
@@
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
refspec: 'refs/heads/{branch}'
branch: '{branch}'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1162,6
+1177,7
@@
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: true
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: true
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1229,6
+1245,7
@@
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1283,6
+1300,7
@@
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
refspec: ''
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1326,6
+1344,8
@@
######################
build-timeout: 10
######################
build-timeout: 10
+ openstack: true
+ openstack-cloud: vex
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-1352,6
+1372,8
@@
builders:
- lf-infra-packer-validate:
builders:
- lf-infra-packer-validate:
+ openstack: '{openstack}'
+ openstack-cloud: '{openstack-cloud}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'
@@
-1378,6
+1400,7
@@
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1417,6
+1440,7
@@
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
+ submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'