Merge "Update DMaaP CSIT mail recipient, add verify job"
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 52361e5..0bb473b 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -9,8 +9,9 @@
name: aai-model-loader-master
project-name: 'aai-model-loader'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
@@ -34,6 +35,8 @@
build-node: ubuntu1804-builder-4c-4g
mvn-version: 'mvn36'
java-version: openjdk11
+ nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: 'ecomp-snapshots'
- project:
name: aai-model-loader-sonar
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a8e4573..f1f7772 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -9,8 +9,9 @@
name: aai-sparky-be-master
project-name: 'aai-sparky-be'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g
@@ -33,6 +34,8 @@
archive-artifacts: ''
mvn-version: 'mvn36'
java-version: openjdk11
+ nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: 'ecomp-snapshots'
- project:
name: aai-sparky-be-sonar
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index d879661..e29f278 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -59,7 +59,7 @@
# SonarCloud
sonarcloud_project_organization: onap
sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff
- sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:4.6.0.2311:sonar"
+ sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar"
# Nexus3 docker registries
container-public-registry: nexus3.onap.org:10001
diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
new file mode 100644
index 0000000..e70dac9
--- /dev/null
+++ b/jjb/oom/oom-helm-legacy.yaml
@@ -0,0 +1,84 @@
+---
+- project:
+ name: oom-legacy
+ project-name: oom-legacy
+ project: oom-legacy
+ mvn-settings: oom-settings
+ mvn-global-settings: global-settings
+ archive-artifacts: ""
+ build-node: ubuntu1804-helm-2c-1g
+ pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+ oom_build_script: |
+ #!/bin/bash
+ source helm.prop
+ set -e -o pipefail
+ cd kubernetes/
+ make HELM_BIN=$HELM_BIN all
+ subproject_build_script: |
+ #!/bin/bash
+ cd kubernetes/
+ make HELM_BIN=$HELM_BIN common
+ make HELM_BIN=$HELM_BIN {subproject}
+
+ helm_bin:
+ - helm3.5
+ - helm3.3
+
+ exclude:
+ - stream: guilin
+ helm_bin: helm3.5
+ - stream: frankfurt
+ helm_bin: helm3.5
+ - stream: frankfurt
+ helm_bin: helm3.3
+ - stream: dublin
+ helm_bin: helm3.5
+ - stream: dublin
+ helm_bin: helm3.3
+ - stream: casablanca
+ helm_bin: helm3.5
+ - stream: casablanca
+ helm_bin: helm3.3
+
+ stream:
+ - "guilin":
+ branch: "guilin"
+ - "frankfurt":
+ branch: "frankfurt"
+ - "dublin":
+ branch: "dublin"
+ - "casablanca":
+ branch: "casablanca"
+
+ subproject:
+ - "aai":
+ files: "kubernetes/aai/**"
+ - "robot":
+ files: "kubernetes/robot/**"
+
+ jobs:
+ - "{project-name}-{stream}-image-verify":
+ files: "**"
+ - "{project-name}-{stream}-verify-helm2":
+ files: "**"
+ build-timeout: 360
+ - "{project-name}-{stream}-verify-{helm_bin}":
+ build_script: "{oom_build_script}"
+ files: "**"
+ build-timeout: 360
+ - "{project-name}-{stream}-merge-helm":
+ build_script: "{oom_build_script}"
+ files: "**"
+ - "{project-name}-{stream}-release-helm":
+ build_script: "{oom_build_script}"
+ post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+ files: "**"
+
+ # Below jobs disabled until future need.
+ - "{project-name}-{subproject}-{stream}-verify-helm2":
+ build_script: "{subproject_build_script}"
+ - "{project-name}-{subproject}-{stream}-merge-helm":
+ build_script: "{subproject_build_script}"
+ - "{project-name}-{stream}-update-helm-weekly":
+ build_script: "{oom_build_script}"
+ files: "**"
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 504f7f4..3c1329a 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -23,49 +23,19 @@
stream:
- "master":
branch: "master"
- - "guilin":
- branch: "guilin"
- - "frankfurt":
- branch: "frankfurt"
- - "dublin":
- branch: "dublin"
- - "casablanca":
- branch: "casablanca"
-
- subproject:
- - "aai":
- files: "kubernetes/aai/**"
- - "robot":
- files: "kubernetes/robot/**"
+ - "honolulu":
+ branch: "honolulu"
helm_bin:
- helm3.5
- helm3.3
- exclude:
- - stream: guilin
- helm_bin: helm3.5
- - stream: frankfurt
- helm_bin: helm3.5
- - stream: frankfurt
- helm_bin: helm3.3
- - stream: dublin
- helm_bin: helm3.5
- - stream: dublin
- helm_bin: helm3.3
- - stream: casablanca
- helm_bin: helm3.5
- - stream: casablanca
- helm_bin: helm3.3
+ exclude: []
+ subproject: []
+
jobs:
- "{project-name}-{stream}-image-verify":
files: "**"
- - "{project-name}-{stream}-verify-helm2":
- files: "**"
- build-timeout: 360
- stream:
- - guilin
- - frankfurt
- "{project-name}-{stream}-verify-{helm_bin}":
build_script: "{oom_build_script}"
files: "**"
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index b943c9f..09194f3 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -2,68 +2,26 @@
- project:
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'
+ - '{project-name}-{stream}-verify-java':
+ # this build is integration test only - CSIT (Verify 2/2)
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
- build-concurrent: true
+ build-node: 'ubuntu1804-docker-8c-16g'
archive-artifacts: >
**/*.log
**/hs_err_*.log
**/target/**/feature.xml
**/target/failsafe-reports/failsafe-summary.xml
- **/target/surefire-reports/*-output.txt
integration-tests/target/ExtentReport/API/*.html
integration-tests/target/ExtentReport/UI/*.html
integration-tests/target/ExtentReport/UI/screenshots/*.png
- /tmp/sdc-integration-tests/*.log*
- /tmp/sdc-integration-tests/SDC/ONBOARDING-BE/*.log
- /tmp/sdc-integration-tests/SDC/SDC-BE/*.log
- /tmp/sdc-integration-tests/SDC/SDC-FE/*.log
- - '{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: 'sdc-integration-tests'
# 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
-# jobs:
-# - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
-# - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
-# project-name: 'sdc'
-# stream:
-# - 'master':
-# branch: 'master'
-# functionality:
-# - 'sanity':
-# trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
-# - 'nightly':
-# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-# - 'uiSanity':
-# trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-# robot-options: ''
-# branch: 'master'
-# html-dir: 'archives'
-# html-files: 'SDC_CI_Extent_Report.html'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index de4ece0..b86fad4 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -28,13 +28,24 @@
project-name: 'sdc'
jobs:
- '{project-name}-{stream}-verify-java':
+ # this build is unit test only (Verify 1/2)
mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
build-node: 'ubuntu1804-docker-8c-8g'
- '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1804-docker-8c-8g'
+ build-node: 'ubuntu1804-docker-8c-16g'
docker-pom: 'pom.xml'
- mvn-profile: 'skip-integration-tests'
+ mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ # running everything (unit tests and integration tests in a single job for merge, as we don't need // run
+ # for merge, but still saving integration tests results and report.
+ archive-artifacts: >
+ **/*.log
+ **/hs_err_*.log
+ **/target/**/feature.xml
+ **/target/failsafe-reports/failsafe-summary.xml
+ integration-tests/target/ExtentReport/API/*.html
+ integration-tests/target/ExtentReport/UI/*.html
+ integration-tests/target/ExtentReport/UI/screenshots/*.png
- gerrit-maven-stage:
build-timeout: 90
sign-artifacts: true