Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Reverting Patch 11273
[ci-management.git]
/
jjb
/
nonrtric-plt-helmmanager
/
nonrtric-plt-helmmanager.yaml
diff --git
a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index
631c5b0
..
d3fccb1
100644
(file)
--- a/
jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/
jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@
-13,7
+13,7
@@
jobs:
- gerrit-info-yaml-verify
jobs:
- gerrit-info-yaml-verify
-- helmmanager_jdk_common: &helmmanager_jdk_common
+-
_
helmmanager_jdk_common: &helmmanager_jdk_common
name: helmmanager-jdk-common
# git repo
project: nonrtric/plt/helmmanager
name: helmmanager-jdk-common
# git repo
project: nonrtric/plt/helmmanager
@@
-22,7
+22,7
@@
# maven settings file has docker credentials
mvn-settings: nonrtric-plt-helmmanager-settings
mvn-version: mvn36
# maven settings file has docker credentials
mvn-settings: nonrtric-plt-helmmanager-settings
mvn-version: mvn36
- java-version: openjdk1
1
+ java-version: openjdk1
7
- project:
<<: *helmmanager_jdk_common
- project:
<<: *helmmanager_jdk_common
@@
-35,8
+35,10
@@
- master:
branch: master
- f-release:
- master:
branch: master
- f-release:
+ java-version: openjdk11
branch: f-release
- g-release:
branch: f-release
- g-release:
+ java-version: openjdk11
branch: g-release
# nonrtric:helmmanager
branch: g-release
# nonrtric:helmmanager
@@
-44,8
+46,8
@@
- project:
<<: *helmmanager_jdk_common
name: nonrtric-plt-helmmanager
- project:
<<: *helmmanager_jdk_common
name: nonrtric-plt-helmmanager
- project-name:
'{name}'
- mvn-opts:
'-Ddocker.skip=true'
+ project-name:
"{name}"
+ mvn-opts:
"-Ddocker.skip=true"
build-node: ubuntu1804-builder-4c-4g
jobs:
- gerrit-maven-stage
build-node: ubuntu1804-builder-4c-4g
jobs:
- gerrit-maven-stage
@@
-54,8
+56,10
@@
- master:
branch: master
- f-release:
- master:
branch: master
- f-release:
+ java-version: openjdk11
branch: f-release
- g-release:
branch: f-release
- g-release:
+ java-version: openjdk11
branch: g-release
- project:
branch: g-release
- project:
@@
-65,4
+69,4
@@
# container release requires docker
build-node: centos7-docker-2c-8g
jobs:
# container release requires docker
build-node: centos7-docker-2c-8g
jobs:
- -
'{project-name}-gerrit-release-jobs'
+ -
"{project-name}-gerrit-release-jobs"