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: update image for ubuntu docker builder
[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
2640061
..
e615443
100644
(file)
--- a/
jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/
jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@
-19,10
+19,10
@@
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 -P docker -Dbuild.number=${{BUILD_NUMBER}}'
mvn-version: "mvn36"
mvn-version: "mvn36"
- maven-version: "mvn36"
mvn-settings: 'oam-nf-oam-adopter-settings'
mvn-settings: 'oam-nf-oam-adopter-settings'
- build-node: centos7-
builder-1c-1
g
+ build-node: centos7-
docker-2c-8
g
- project:
<<: *oam-nf-oam-adopter
- project:
<<: *oam-nf-oam-adopter
@@
-36,20
+36,20
@@
<<: *oam-nf-oam-adopter
jobs:
- gerrit-maven-verify
<<: *oam-nf-oam-adopter
jobs:
- gerrit-maven-verify
- - gerrit-maven-merge:
- mvn-params: '-P docker'
+ - gerrit-maven-merge
+ - gerrit-maven-docker-verify
+ - gerrit-maven-docker-merge:
- gerrit-maven-stage:
- gerrit-maven-stage:
+ build-node: centos7-docker-2c-8g
sign-artifacts: true
sign-artifacts: true
- build-node: centos7-builder-1c-1g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: centos7-
builder-1c-1
g
+ build-node: centos7-
docker-2c-8
g
maven-versions-plugin: true
maven-versions-plugin: true
- mvn-params: '-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':
- build-node: centos7-
builder-1c-1
g
+ build-node: centos7-
docker-2c-8
g
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
@@
-65,17
+65,9
@@
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'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
cron: '@daily'
branch: 'master'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-params: '-Ddocker.skip=true'
-
-- project:
- <<: *oam-nf-oam-adopter
- name: oam-nf-oam-adopter-whitesource
- jobs:
- - gerrit-whitesource-scan
- wss-product-name: nf-oam-adopter
- mvn-clean-install: true
- branch: master
+ mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
\ No newline at end of file