Merge "Finalize maven docker snapshot template"

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index c620652..5593b10 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -39,7 +39,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
@@ -55,7 +55,7 @@
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-docker-8c-8g
 
 - project:
     name: cps-sonar
@@ -70,7 +70,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-docker-8c-8g
     project: 'cps'
     project-name: 'cps'
     branch: 'master'

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index e02d612..2284650 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -35,6 +35,25 @@
     build-timeout: 60
     maven-version: 'mvn35'
 
+- project:
+    name: sdc-sdc-distribution-client-integration-pairwise
+    java-version: openjdk11
+    jobs:
+       - '{project-name}-{stream}-integration-pairwise'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    stream:
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+    mvn-params: ' -P integration-pairwise'
+
 - project:
     name: sdc-sdc-distribution-client-sonar
     jobs:

diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
new file mode 100644 (file)
index 0000000..96ce897
--- /dev/null
+++ b/jjb/vnfsdk/generate-dosc.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mvn clean install -DskipDocsGeneration=false

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 1146d76..b95c3a7 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -70,11 +70,11 @@
       project-name: 'vnfsdk-requirements'
       mvn-settings: 'vnfsdk-validation-settings'
       mvn-global-settings: 'global-settings'
-      mvn-goals: 'clean install -DskipDocsGeneration=false'
       stream:
           - 'master':
                 branch: 'master'
       jobs:
           - '{project-name}-{stream}-build-and-upload':
+                pre_script: !include-raw-escape: ./generate-dosc.sh
                 project_id: org.onap.vnfsdk.refrepo
                 post_script: !include-raw-escape: ./upload-artifact.sh