Merge "Fix sonar job"
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 319b544..14bffbc 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -12,10 +12,9 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
disabled: true
- - '{project-name}-{stream}-aai-docker-java-version-daily':
- pom: 'aai-resources/pom.xml'
- mvn-goals: 'docker:build docker:push'
- disabled: true
+ - '{project-name}-{stream}-docker-java-daily':
+ docker-pom: 'aai-resources/pom.xml'
+ mvn-profile: 'docker'
project: 'aai/resources'
stream:
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index d458c59..4470606 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -26,13 +26,14 @@
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
- project:
- name: vfc-nfvo-driver-vnfm-gvnfm-sonar
+ name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
+ mvn-params: '-f gvnfmadapter/pom.xml'
build-node: ubuntu1604-basebuild-4c-4g
project: 'vfc/nfvo/driver/vnfm/gvnfm'
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+ project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
mvn-goals: 'clean install'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 7f966f9..5da3ffa 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -9,7 +9,7 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
subproject:
- 'drv-vnfm-nokia':
- pom: 'nokia/vnfmdirver/pom.xml'
+ pom: 'nokia/vnfmdriver/pom.xml'
pattern: 'nokia/vnfmdriver/**'
jobs:
- gerrit-maven-clm: