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
Revert lftools back to v0.18.0
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
61e74f3
..
e02d753
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-58,7
+58,6
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
- lf-packer-parameters:
packer-version: '{packer-version}'
- lf-packer-parameters:
packer-version: '{packer-version}'
@@
-77,6
+76,10
@@
name: JJB_VERSION
default: '{jjb-version}'
description: Jenkins Job Builder version to download and install.
name: JJB_VERSION
default: '{jjb-version}'
description: Jenkins Job Builder version to download and install.
+ - string:
+ name: XDG_CACHE_HOME
+ default: '{jjb-cache}'
+ description: Jenkins Job Builder cache location.
- parameter:
name: lf-packer-parameters
- parameter:
name: lf-packer-parameters
@@
-97,7
+100,8
@@
build-timeout: 10
disable-job: false
github-url: 'https://github.com'
build-timeout: 10
disable-job: false
github-url: 'https://github.com'
- jjb-version: 2.2.1
+ jjb-cache: '$HOME/.cache/jenkins_jobs'
+ jjb-version: 2.8.0
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
@@
-134,8
+138,8
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
- lf-infra-jjb-parameters:
- lf-infra-jjb-parameters:
+ jjb-cache: '{jjb-cache}'
jjb-version: '{jjb-version}'
wrappers:
jjb-version: '{jjb-version}'
wrappers:
@@
-185,7
+189,6
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
@@
-289,7
+292,6
@@
project: '{project}'
stream: ''
branch: master
project: '{project}'
stream: ''
branch: master
- lftools-version: '{lftools-version}'
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
@@
-430,7
+432,6
@@
project: '{project}'
stream: ''
branch: master
project: '{project}'
stream: ''
branch: master
- lftools-version: '{lftools-version}'
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
@@
-540,6
+541,7
@@
parameters:
- lf-infra-jjb-parameters:
parameters:
- lf-infra-jjb-parameters:
+ jjb-cache: '{jjb-cache}'
jjb-version: '{jjb-version}'
triggers:
jjb-version: '{jjb-version}'
triggers:
@@
-609,7
+611,6
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
@@
-804,6
+805,8
@@
# Default parameters #
######################
# Default parameters #
######################
+ build-concurrent: true
+
gerrit_verify_triggers:
- patchset-created-event:
exclude-drafts: true
gerrit_verify_triggers:
- patchset-created-event:
exclude-drafts: true
@@
-817,7
+820,7
@@
# Job Configuration #
#####################
# Job Configuration #
#####################
- concurrent:
true
+ concurrent:
'{build-concurrent}'
builders:
- lf-infra-pre-build
builders:
- lf-infra-pre-build
@@
-1035,7
+1038,6
@@
project: '{project}'
branch: '{branch}'
stream: '{stream}'
project: '{project}'
branch: '{branch}'
stream: '{stream}'
- lftools-version: '{lftools-version}'
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
@@
-1242,6
+1244,7
@@
openstack-image-cleanup: true
openstack-image-cleanup-age: 30
openstack-image-protect: true
openstack-image-cleanup: true
openstack-image-cleanup-age: 30
openstack-image-protect: true
+ openstack-server-cleanup: true
openstack-stack-cleanup: true
openstack-volume-cleanup: true
stream: master
openstack-stack-cleanup: true
openstack-volume-cleanup: true
stream: master
@@
-1265,7
+1268,6
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
- string:
name: JENKINS_URLS
default: '{jenkins-urls}'
- string:
name: JENKINS_URLS
default: '{jenkins-urls}'
@@
-1299,6
+1301,12
@@
condition-expression: '{openstack-stack-cleanup}'
steps:
- shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-stacks.sh
condition-expression: '{openstack-stack-cleanup}'
steps:
- shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-stacks.sh
+ # Servers
+ - conditional-step:
+ condition-kind: boolean-expression
+ condition-expression: '{openstack-server-cleanup}'
+ steps:
+ - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-servers.sh
# Volumes
- conditional-step:
condition-kind: boolean-expression
# Volumes
- conditional-step:
condition-kind: boolean-expression
@@
-1375,7
+1383,6
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
project: '{project}'
stream: '{stream}'
branch: '{branch}'
- lftools-version: '{lftools-version}'
- lf-packer-parameters:
packer-version: '{packer-version}'
- lf-packer-parameters:
packer-version: '{packer-version}'
@@
-1468,8
+1475,10
@@
scm:
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
scm:
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
- refspec: ''
- branch: 'refs/heads/{branch}'
+ refspec: >
+ +refs/heads/*:refs/remotes/origin/*
+ +refs/pull/*:refs/remotes/origin/pr/*
+ branch: '$GERRIT_REFSPEC'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default