Merge "Fix slice-analysis-ms docker build job"

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 54dbe98..defd99e 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -6,13 +6,13 @@
       - gerrit-maven-verify
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
-          maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -41,7 +41,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -82,7 +82,6 @@
     mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 55c5e90..fb0a334 100755 (executable)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -7,8 +7,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index da5dfdc..55df274 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1090,6 +1090,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index da9827b..ff30754 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -10,7 +10,7 @@
     subproject:
       - 'azure':
           pom: 'azure/pom.xml'
-          pattern: 'azure/**'
+          pattern: 'azure/azure/**'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'

diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
new file mode 100644 (file)
index 0000000..bb0b2dd
--- /dev/null
+++ b/jjb/oom/oom-consul.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: oom-consul-project-view
+    project-name: oom-consul
+    views:
+      - project-view
+
+- project:
+    name: oom-consul-info
+    project: oom/consul
+    project-name: oom-consul
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 22fa481..c64d17e 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,7 +35,6 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-          java-version: openjdk11
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true