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 jenkins-verify-images.sh crash on grep
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
1d933e7
..
3ec2b49
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.
4
+ packer-version: 1.4.
2
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-408,7
+408,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
+465,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:
@@
-737,9
+734,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
+847,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
+950,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
+1993,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
+2043,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
+2054,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}"