Merge "Use cps-xnf-docker profile for cps"

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index c714112..fa7f8cf 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -18,16 +18,12 @@
     rtdproject: 'onap/58810/'
     mvn-settings: 'doc-settings'
     stream:
-      - amsterdam:
-          branch: 'amsterdam'
-      - beijing:
-          branch: 'beijing'
-      - casablanca:
-          branch: 'casablanca'
-      - dublin:
-          branch: 'dublin'
-      - elalto:
-          branch: 'elalto'
+      - master:
+          branch: 'master'
+      - guilin:
+          branch: 'guilin'
+      - frankfurt:
+          branch: 'frankfurt'
 
 - project:
     name: doc-info

diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml
index 252e2d3..0089454 100644 (file)
--- a/jjb/integration/integration-terraform.yaml
+++ b/jjb/integration/integration-terraform.yaml
@@ -38,3 +38,18 @@
     stream:
       - 'master':
           branch: 'master'
+
+- project:
+    name: integration-terraform-validate
+    project: integration/terraform
+    project-name: integration-terraform
+    jobs:
+      - integration-terraform-verify
+    subproject:
+      - 'openlab':
+          tox-dir: 'openlab'
+          tox-envs: 'terraform'
+          pattern: 'openlab/**'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml
index 922fbc1..04391fb 100644 (file)
--- a/jjb/integration/integration-terragrunt.yaml
+++ b/jjb/integration/integration-terragrunt.yaml
@@ -44,3 +44,18 @@
     stream:
       - 'master':
           branch: 'master'
+
+- project:
+    name: integration-terragrunt-validate
+    project: integration/terragrunt
+    project-name: integration-terragrunt
+    jobs:
+      - integration-terraform-verify
+    subproject:
+      - 'terragrunt':
+          tox-dir: '.'
+          tox-envs: 'terragrunt'
+          pattern: '**'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 51654c5..3ebab83 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -1,26 +1,37 @@
 ---
 - project:
-    name: sdc-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'sdc'
-    disabled: true
-    recipients: 'ofir.sonsino@intl.att.com'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'sanity':
-          trigger_jobs:
-      - 'nightly':
-          trigger_jobs:
-      - 'uiSanity':
-          trigger_jobs:
-    robot-options: ''
-    branch: 'master'
-    html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
+      name: sdc-csit
+      jobs:
+          - '{project-name}-review-verification-maven-{stream}':
+                build-node: ubuntu1804-docker-8c-16g
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-snapshot-registry: 'nexus3.onap.org:10003'
+                mvn-goals: clean install
+                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker, all-for-integration-tests-only'
+                maven-versions-plugin: true
+          - '{project-name}-merge-verification-maven-{stream}':
+                build-node: ubuntu1804-docker-8c-16g
+                container-public-registry: 'nexus3.onap.org:10001'
+                container-snapshot-registry: 'nexus3.onap.org:10003'
+                mvn-goals: clean install
+                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker, all-for-integration-tests-only'
+                maven-versions-plugin: true
+
+      project-name: 'sdc'
+      recipients: 'christophe.closset@intl.att.com'
+      # project name in gerrit
+      project: 'sdc'
+      stream:
+          - 'master':
+                branch: 'master'
+          - 'guilin':
+                branch: 'guilin'
+      java-version: openjdk11
+      mvn-version: 'mvn36'
+      mvn-settings: 'sdc-settings'
+      mvn-global-settings: global-settings
+      robot-options: ''
+      branch: 'master'
 
 #- project:
 #    name: sdc-csit-arm64

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index c6a9ecc..71eb39a 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -28,12 +28,12 @@
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-P docker -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
-          build-node: 'ubuntu1804-docker-8c-16g'
+          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          build-node: 'ubuntu1804-builder-4c-4g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-16g'
+          build-node: 'ubuntu1804-builder-4c-4g'
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-profile: 'skip-integration-tests'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-stage:
           build-timeout: 90
@@ -58,9 +58,9 @@
       - 'guilin':
           branch: 'guilin'
           java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
-          java-version: openjdk8
+#     - 'frankfurt':
+#         branch: 'frankfurt'
+#         java-version: openjdk8
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''