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 sonar job after Go version uplift
[ci-management.git]
/
jjb
/
nonrtric-plt-sme
/
nonrtric-plt-sme.yaml
diff --git
a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index
d4164df
..
dc5303e
100644
(file)
--- a/
jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/
jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@
-5,47
+5,35
@@
views:
- project-view
views:
- project-view
-- project:
+- project:
&sme_common
name: nonrtric-plt-sme-info
project: nonrtric/plt/sme
project-name: nonrtric-plt-sme
name: nonrtric-plt-sme-info
project: nonrtric/plt/sme
project-name: nonrtric-plt-sme
+ # maven settings file has docker credentials
+ mvn-settings: nonrtric-plt-sme-settings
build-node: centos7-builder-1c-1g
branch: master
jobs:
- gerrit-info-yaml-verify
build-node: centos7-builder-1c-1g
branch: master
jobs:
- gerrit-info-yaml-verify
-
-- sme_common: &sme_common
- name: sme-common
- # git repo
- project: nonrtric/plt/sme
- # jenkins job name prefix
- project-name: nonrtric-plt-sme
- # maven settings file has docker credentials
- mvn-settings: nonrtric-plt-sme-settings
- project:
<<: *sme_common
- project:
<<: *sme_common
- name: nonrtric-plt-sme-release
- # maven release requires sigul which requires centos
- # container release requires docker
- build-node: centos7-docker-2c-8g
- jobs:
- - '{project-name}-gerrit-release-jobs'
-
-- project:
- <<: *sme_common
- name: nonrtric-plt-sme
+ name: nonrtric-plt-sme-capifcore
project-name: '{name}'
# image name
project-name: '{name}'
# image name
- docker-name: 'o-ran-sc/nonrtric-plt-
sm
e'
+ docker-name: 'o-ran-sc/nonrtric-plt-
capifcor
e'
# get tag from YAML
container-tag-method: yaml-file
# use host network to clone from our gerrit
docker-build-args: '--network=host'
# Directory with Dockerfile
# get tag from YAML
container-tag-method: yaml-file
# use host network to clone from our gerrit
docker-build-args: '--network=host'
# Directory with Dockerfile
- docker-root: '.'
+ docker-root: 'capifcore'
+ # Limit build trigger to appropriate files
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'capifcore/.*'
# Directory where go test should be run
# Directory where go test should be run
- go-root: '
.
'
+ go-root: '
capifcore
'
build-node: ubuntu1804-docker-4c-4g
# Includes verify and merge jobs
jobs:
build-node: ubuntu1804-docker-4c-4g
# Includes verify and merge jobs
jobs:
@@
-57,15
+45,14
@@
- project:
<<: *sme_common
- project:
<<: *sme_common
- name: nonrtric-plt-sme-sonar
- project-name: nonrtric-plt-sme
- # prescan script requires ubuntu
- # golang is only on docker-enabled nodes
+ name: nonrtric-plt-sme-capifcore-sonar
+ project-name: nonrtric-plt-sme-capifcore
build-node: ubuntu1804-docker-4c-4g
build-node: ubuntu1804-docker-4c-4g
- sonar-prescan-script: !include-raw-escape: prescan-sme-ubuntu.sh
- sonar-project-file: ""
java-version: openjdk11
java-version: openjdk11
- # use sonarcloud values from defaults.yaml
- sonar-properties: !include-raw: sonar-project.properties
+ sonarcloud: true
+ sonar-project-file: ""
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonarcloud-project-name: '{project-name}'
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
jobs:
jobs:
- - gerrit-
sonar-prescan-script
+ - gerrit-
cli-sonar