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
[DCAE] Remove istanbul branch job
[ci-management.git]
/
jjb
/
dcaegen2
/
dcaegen2-collectors-ves.yaml
diff --git
a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index
b37d40c
..
1e551bf
100644
(file)
--- a/
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/
jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@
-4,8
+4,11
@@
project-name: 'dcaegen2-collectors-ves'
java-version: openjdk11
jobs:
project-name: 'dcaegen2-collectors-ves'
java-version: openjdk11
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify:
+ pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+ - gerrit-maven-merge
+ # - '{project-name}-{stream}-verify-java'
+ # - '{project-name}-{stream}-merge-java'
- gerrit-maven-stage:
sign-artifacts: false
sbom-generator: true
- gerrit-maven-stage:
sign-artifacts: false
sbom-generator: true
@@
-23,8
+26,6
@@
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- 'jakarta':
branch: 'jakarta'
mvn-settings: 'dcaegen2-collectors-ves-settings'
- 'jakarta':
branch: 'jakarta'
mvn-settings: 'dcaegen2-collectors-ves-settings'
@@
-36,6
+37,9
@@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1804-docker-8c-8g'
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1804-docker-8c-8g'
+ mvn-snapshot-id: 'ecomp-snapshots'
+ mvn-version: 'mvn36'
+ nexus-snapshot-repo: 'snapshots'
- project:
name: dcaegen2-collectors-ves-sonar
- project:
name: dcaegen2-collectors-ves-sonar
@@
-68,8
+72,6
@@
stream:
- 'master':
branch: 'master'
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'dcaegen2-collectors-ves-settings'
- project:
mvn-settings: 'dcaegen2-collectors-ves-settings'
- project: