Merge "Add JJB to build/push integration/netconf-pnp-simulator"

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
index 38274c7..87c5a71 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
@@ -23,7 +23,7 @@
     docker-root: components/pm-subscription-handler
     # tag override
     # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/
-    # docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
+    docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
     # image name
     docker-name: 'onap/org.onap.dcaegen2.services.pmsh'
     stream:
@@ -46,12 +46,11 @@
 - project:
     <<: *dcaegen2_services_common
     name: dcaegen2-services-pmsh-sonar
-    docker-root: components/pm-subscription-handler
+    docker-root: components/pm-subscription-handler/
     cron: '@daily'
     branch: master
     jobs:
-      - gerrit-tox-sonar:
-          sonar-mvn-goal: '-f components/pm-subscription-handler/pom.xml sonar:sonar'
+      - gerrit-tox-sonar
 
 - project:
     <<: *dcaegen2_services_common

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 62947a0..6e6b289 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -81,7 +81,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: centos7-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 0483624..273e377 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -32,7 +32,6 @@
 
 - project:
     name: vfc-nfvo-driver-sfc-sonar
-    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 8beb8d4..9fa63c6 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -24,7 +24,6 @@
 
 - project:
     name: vfc-nfvo-resmanagement-sonar
-    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true