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
Restore jobs nonrtric-o-ru-closed-loop-recovery
[ci-management.git]
/
jjb
/
oam-nf-oam-adopter
/
oam-nf-adopter.yaml
diff --git
a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index
8462354
..
e615443
100644
(file)
--- a/
jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/
jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@
-19,9
+19,8
@@
project-name: oam-nf-oam-adopter
java-version: openjdk11
mvn-pom: 'ves-nf-oam-adopter/pom.xml'
project-name: oam-nf-oam-adopter
java-version: openjdk11
mvn-pom: 'ves-nf-oam-adopter/pom.xml'
- mvn-params: '-f ves-nf-oam-adopter/pom.xml'
+ mvn-params: '-f ves-nf-oam-adopter/pom.xml
-P docker -Dbuild.number=${{BUILD_NUMBER}}
'
mvn-version: "mvn36"
mvn-version: "mvn36"
- maven-version: "mvn36"
mvn-settings: 'oam-nf-oam-adopter-settings'
build-node: centos7-docker-2c-8g
mvn-settings: 'oam-nf-oam-adopter-settings'
build-node: centos7-docker-2c-8g
@@
-37,16
+36,16
@@
<<: *oam-nf-oam-adopter
jobs:
- gerrit-maven-verify
<<: *oam-nf-oam-adopter
jobs:
- gerrit-maven-verify
- - gerrit-maven-merge:
- mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
+ - gerrit-maven-merge
+ - gerrit-maven-docker-verify
+ - gerrit-maven-docker-merge:
- gerrit-maven-stage:
- gerrit-maven-stage:
- sign-artifacts: true
build-node: centos7-docker-2c-8g
build-node: centos7-docker-2c-8g
+ sign-artifacts: true
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: centos7-docker-2c-8g
maven-versions-plugin: true
maven-versions-plugin: true
- gerrit-maven-docker-stage:
build-node: centos7-docker-2c-8g
maven-versions-plugin: true
- mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
container-public-registry: nexus3.o-ran-sc.org:10001
container-staging-registry: nexus3.o-ran-sc.org:10004
- '{project-name}-gerrit-release-jobs':
container-public-registry: nexus3.o-ran-sc.org:10001
container-staging-registry: nexus3.o-ran-sc.org:10004
- '{project-name}-gerrit-release-jobs':
@@
-66,6
+65,7
@@
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonarcloud-project-organization: '{sonarcloud_project_organization}'
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar.build.sourceEncoding: 'UTF-8'
cron: '@daily'
branch: 'master'
mvn-goals: 'clean install'
cron: '@daily'
branch: 'master'
mvn-goals: 'clean install'