diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 6 | ||||
| -rw-r--r-- | jjb/cps/cps.yaml | 3 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 26 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml | 2 |
4 files changed, 17 insertions, 20 deletions
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 0a4647835..a8e457333 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -31,6 +31,8 @@ mvn-settings: 'aai-sparky-be-settings' files: '**' archive-artifacts: '' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-sparky-be-sonar @@ -49,6 +51,8 @@ mvn-settings: 'aai-sparky-be-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-sparky-be-clm @@ -61,6 +65,8 @@ - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' + mvn-version: 'mvn36' + java-version: openjdk11 - project: name: aai-sparky-be-info diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index a1d73784f..0e4baef01 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -43,10 +43,11 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + mvn-params: '-DprocessAllModules' - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P cps-xnf-docker' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 7c938f0a0..a78dcd609 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -14,20 +14,19 @@ build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-collectors-snmptrap-settings' jobs: - - gerrit-tox-verify - - gerrit-docker-verify - - gerrit-docker-merge + - '{project-name}-python-jobs' - '{project-name}-{stream}-release-version-java-daily' - files: '**' archive-artifacts: '' container-tag-method: latest - docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh' nexus-iq-namespace: 'onap-' - docker-root: '.' - docker-name: onap/org.onap.dcaegen2.collectors.snmptrap gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: '**' + pattern: '.*' + maven-deploy-properties: | + deployAtEnd=true + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + files: '**' - project: @@ -49,17 +48,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: dcaegen2-collectors-snmptrap-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/collectors/snmptrap - build-node: ubuntu1804-docker-8c-8g - project-name: 'dcaegen2-collectors-snmptrap' - branch: 'master' - mvn-settings: 'dcaegen2-collectors-snmptrap-settings' - -- project: name: dcaegen2-collectors-snmptrap-info project-name: dcaegen2-collectors-snmptrap jobs: diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml index 63e1b07ae..b68e769b0 100644 --- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml @@ -11,5 +11,7 @@ functionality: - 'pmmapper': trigger_jobs: + - 'files-processing-config-pmmapper': + trigger_jobs: robot-options: '' branch: 'master' |