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
Fix FLOATING_IP_POOL default value
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
981e84d
..
59045b6
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-29,7
+29,7
@@
submodule-timeout: 10
submodule-disable: false
packer-cloud-settings: packer-cloud-env
submodule-timeout: 10
submodule-disable: false
packer-cloud-settings: packer-cloud-env
- packer-version: 1.4.
3
+ packer-version: 1.4.
2
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-166,19
+166,18
@@
######################
- job-template:
######################
- job-template:
- name: "{project-name}-gerrit-branch-lock
-{stream}
"
+ name: "{project-name}-gerrit-branch-lock"
id: gerrit-branch-lock
######################
# Default parameters #
######################
id: gerrit-branch-lock
######################
# Default parameters #
######################
- branch:
master
+ branch:
"**"
disable-job: false
git-url: "$GIT_URL/$GERRIT_PROJECT"
disable-job: false
git-url: "$GIT_URL/$GERRIT_PROJECT"
- stream: master
submodule-timeout: 10
submodule-timeout: 10
- submodule-disable:
fals
e
+ submodule-disable:
tru
e
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$
@@
-199,7
+198,7
@@
parameters:
- lf-infra-parameters:
project: "{project}"
parameters:
- lf-infra-parameters:
project: "{project}"
- stream: "
{stream}
"
+ stream: ""
branch: "{branch}"
wrappers:
branch: "{branch}"
wrappers:
@@
-211,7
+210,7
@@
- lf-infra-gerrit-scm:
git-url: "{git-url}"
refspec: ""
- lf-infra-gerrit-scm:
git-url: "{git-url}"
refspec: ""
- branch: "
{branch}
"
+ branch: "
$GERRIT_BRANCH
"
submodule-recursive: false
submodule-timeout: "{submodule-timeout}"
submodule-disable: "{submodule-disable}"
submodule-recursive: false
submodule-timeout: "{submodule-timeout}"
submodule-disable: "{submodule-disable}"
@@
-224,7
+223,7
@@
trigger-on: "{obj:gerrit_merge_triggers}"
projects:
- project-compare-type: ANT
trigger-on: "{obj:gerrit_merge_triggers}"
projects:
- project-compare-type: ANT
- project-pattern: "
{project}
"
+ project-pattern: "
**
"
branches:
- branch-compare-type: ANT
branch-pattern: "**/{branch}"
branches:
- branch-compare-type: ANT
branch-pattern: "**/{branch}"
@@
-408,7
+407,6
@@
disable-job: false
git-url: "$GIT_URL/$GERRIT_PROJECT"
github-url: "https://github.com"
disable-job: false
git-url: "$GIT_URL/$GERRIT_PROJECT"
github-url: "https://github.com"
- openstack-cloud: vex
submodule-timeout: 10
submodule-disable: false
submodule-timeout: 10
submodule-disable: false
@@
-466,8
+464,6
@@
builders:
- lf-infra-pre-build
builders:
- lf-infra-pre-build
- - inject:
- properties-content: OS_CLOUD={openstack-cloud}
- shell: !include-raw-escape: ../shell/jenkins-verify-images.sh
publishers:
- shell: !include-raw-escape: ../shell/jenkins-verify-images.sh
publishers:
@@
-568,9
+564,7
@@
builders:
- lf-infra-jjbini
- shell: !include-raw-escape:
builders:
- lf-infra-jjbini
- shell: !include-raw-escape:
- - ../shell/jjb-install.sh
- ../shell/jenkins-sandbox-cleanup.sh
- ../shell/jenkins-sandbox-cleanup.sh
- - ../shell/jjb-cleanup.sh
- job-template:
name: "{project-name}-jenkins-sandbox-cleanup"
- job-template:
name: "{project-name}-jenkins-sandbox-cleanup"
@@
-636,8
+630,6
@@
jenkins-ssh-credential: "{jenkins-ssh-credential}"
builders:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
builders:
- - lf-pip-install:
- pip-packages: jenkins-job-builder
- lf-infra-jjbini
- shell: !include-raw-escape: ../shell/jjb-deploy-job.sh
- lf-infra-jjbini
- shell: !include-raw-escape: ../shell/jjb-deploy-job.sh
@@
-737,9
+729,7
@@
- inject:
properties-content: JJB_WORKERS={jjb-workers}
- shell: !include-raw-escape:
- inject:
properties-content: JJB_WORKERS={jjb-workers}
- shell: !include-raw-escape:
- - ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
- ../shell/jjb-merge-job.sh
- - ../shell/jjb-cleanup.sh
- job-template:
name: "{project-name}-jjb-merge"
- job-template:
name: "{project-name}-jjb-merge"
@@
-852,11
+842,7
@@
- lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- - ../shell/git-validate-jira-urls.sh
- - ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-verify-job.sh
- - ../shell/jjb-check-unicode.sh
- - ../shell/jjb-cleanup.sh
- lf-infra-gpg-verify-git-signature
- job-template:
- lf-infra-gpg-verify-git-signature
- job-template:
@@
-959,11
+945,7
@@
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
- shell: !include-raw-escape:
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
- shell: !include-raw-escape:
- - ../shell/git-validate-jira-urls.sh
- - ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-verify-job.sh
- - ../shell/jjb-check-unicode.sh
- - ../shell/jjb-cleanup.sh
- lf-infra-gpg-verify-git-signature
- job-template:
- lf-infra-gpg-verify-git-signature
- job-template:
@@
-2006,6
+1988,7
@@
# Sonar properties
sonar-task: ""
# Sonar properties
sonar-task: ""
+ sonar-project-file: "sonar-project.properties"
sonar-properties: ""
sonar-java-opts: ""
sonar-additional-args: ""
sonar-properties: ""
sonar-java-opts: ""
sonar-additional-args: ""
@@
-2055,6
+2038,7
@@
- lf-infra-pre-build
- lf-infra-sonar:
sonar-task: "{sonar-task}"
- lf-infra-pre-build
- lf-infra-sonar:
sonar-task: "{sonar-task}"
+ sonar-project-file: "{sonar-project-file}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
@@
-2065,6
+2049,7
@@
- lf-infra-pre-build
- lf-infra-sonar-with-prescan:
sonar-task: "{sonar-task}"
- lf-infra-pre-build
- lf-infra-sonar-with-prescan:
sonar-task: "{sonar-task}"
+ sonar-project-file: "{sonar-project-file}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"
sonar-properties: "{sonar-properties}"
sonar-java-opts: "{sonar-java-opts}"
sonar-additional-args: "{sonar-additional-args}"