summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg2
-rw-r--r--jjb/aai/aai-babel.yaml7
-rw-r--r--jjb/aai/aai-model-loader.yaml7
-rw-r--r--jjb/aai/aai-sparky-be.yaml7
-rw-r--r--jjb/ccsdk/ccsdk-csit.yaml17
-rw-r--r--jjb/cps/cps-cps-tbdmt.yaml3
-rw-r--r--jjb/dmaap/dmaap-buscontroller-csit.yaml1
-rw-r--r--jjb/dmaap/dmaap-csit.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter-csit.yaml2
-rw-r--r--jjb/integration-simulators-nf-simulator-avcn-manager/integration-simulators-nf-simulator-avcn-manager.yaml14
-rw-r--r--jjb/integration/integration-templates-csit.yaml7
-rwxr-xr-xjjb/multicloud/build-multicloud-azure-docker-image.sh11
-rw-r--r--jjb/multicloud/multicloud-azure-java.yaml91
-rw-r--r--jjb/multicloud/multicloud-azure-python.yaml16
-rw-r--r--jjb/oom/oom-helm-legacy.yaml84
-rw-r--r--jjb/oom/oom-helm.yaml40
-rw-r--r--jjb/sdc/sdc-csit.yaml46
-rw-r--r--jjb/sdc/sdc.yaml15
22 files changed, 164 insertions, 216 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index 817e6812f..d3cd46abd 100644
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200220-113128.675
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
LABELS=queue-docker-4c-4g
HARDWARE_ID=v2-highcpu-4
INSTANCE_CAP=1
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 7b095be99..0ad121ad4 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210129-195204.476
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20210223-063350.962
LABELS=ubuntu1804-builder-4c-4g
HARDWARE_ID=v2-highcpu-4
VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index fe7549c24..7ad0f8a8a 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
LABELS=ubuntu1804-docker-8c-16g
HARDWARE_ID=v2-highcpu-16
VOLUME_SIZE=40
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index e9c00987e..b2c8e2bd4 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210202-193426.087
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
LABELS=ubuntu1804-docker-8c-8g
HARDWARE_ID=v2-highcpu-8
VOLUME_SIZE=20
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
index 52ffcd9c5..2be74d14a 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
LABELS=ubuntu1804-docker-v1-8c-8g
HARDWARE_ID=v1-standard-8
VOLUME_SIZE=50
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 62e7c9378..158df9bca 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -9,8 +9,9 @@
name: aai-babel
project-name: 'aai-babel'
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
java-version: openjdk11
mvn-version: 'mvn36'
+ nexus-snapshot-repo: 'snapshots'
+ mvn-snapshot-id: 'ecomp-snapshots'
- project:
name: aai-babel-sonar
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 52361e5b0..0bb473b60 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 a8e457333..f1f777205 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/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index fc634fdd5..d33a25ac2 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -22,16 +22,21 @@
- project:
name: ccsdk-oran-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+ maven-versions-plugin: true
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
+ maven-versions-plugin: true
project-name: 'ccsdk-oran'
- recipients: 'bjorn.magnusson@est.tech maxime.bonneau@est.tech'
+ recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
+ # project name in gerrit
+ project: 'ccsdk/oran'
stream:
- 'master':
branch: 'master'
- 'guilin':
branch: 'guilin'
- functionality:
- - 'polmansuite':
- trigger_jobs: '{project-name}-maven-merge-{stream}'
+ mvn-settings: 'ccsdk-oran-settings'
robot-options: ''
+ branch: 'master' \ No newline at end of file
diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index 5806a5c3c..fd3aae010 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -37,7 +37,8 @@
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
jobs:
- - gerrit-maven-verify
+ - gerrit-maven-verify:
+ mvn-goals: 'clean install'
- gerrit-maven-merge
- gerrit-maven-stage:
sign-artifacts: true
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 04495e276..2fc6419ff 100644
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -5,6 +5,7 @@
- '{project-name}-{stream}-csit-{functionality}'
- '{project-name}-{stream}-verify-csit-{functionality}'
project-name: 'dmaap-buscontroller'
+ recipients: 'fiachra.corcoran@est.tech'
stream: 'master'
disabled: false
functionality:
diff --git a/jjb/dmaap/dmaap-csit.yaml b/jjb/dmaap/dmaap-csit.yaml
index af1d8a9c0..8bea9e17d 100644
--- a/jjb/dmaap/dmaap-csit.yaml
+++ b/jjb/dmaap/dmaap-csit.yaml
@@ -5,7 +5,7 @@
- '{project-name}-{stream}-csit-{functionality}'
- '{project-name}-{stream}-verify-csit-{functionality}'
project-name: 'dmaap'
- recipients: 'ms5838@att.com'
+ recipients: 'fiachra.corcoran@est.tech'
stream: 'master'
functionality:
- 'mrpubsub':
diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
index 254e445ed..e991363d0 100644
--- a/jjb/dmaap/dmaap-datarouter-csit.yaml
+++ b/jjb/dmaap/dmaap-datarouter-csit.yaml
@@ -3,7 +3,9 @@
name: dmaap-datarouter-csit-ssl
jobs:
- '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-{stream}-verify-csit-{functionality}'
project-name: 'dmaap-datarouter'
+ recipients: 'fiachra.corcoran@est.tech'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/integration-simulators-nf-simulator-avcn-manager/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration-simulators-nf-simulator-avcn-manager/integration-simulators-nf-simulator-avcn-manager.yaml
new file mode 100644
index 000000000..d28c72af6
--- /dev/null
+++ b/jjb/integration-simulators-nf-simulator-avcn-manager/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: integration-simulators-nf-simulator-avcn-manager-project-view
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ views:
+ - project-view
+
+- project:
+ name: integration-simulators-nf-simulator-avcn-manager-info
+ project: integration/simulators/nf-simulator/avcn-manager
+ project-name: integration-simulators-nf-simulator-avcn-manager
+ build-node: centos7-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f4ca048a0..95d8fb36d 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -228,7 +228,14 @@
- integration-run-project-test
- lf-provide-maven-settings-cleanup
publishers:
+ - integration-project-robot:
+ unstable-if: 0.0
+ pass-if: 100.0
- lf-infra-publish
+ - email:
+ recipients: '{recipients}'
+ notify-every-unstable-build: false
+ send-to-individuals: true
- job-template:
# Job template for unified review verification jobs in
diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh
deleted file mode 100755
index e4e6d8d79..000000000
--- a/jjb/multicloud/build-multicloud-azure-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./azure/docker/*.*
-
-./azure/docker/build_image.sh
-
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
deleted file mode 100644
index d61066323..000000000
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-- project:
- name: multicloud-azure-java
- project-name: 'multicloud-azure'
- project: 'multicloud/azure'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- subproject:
- - 'azure':
- pom: 'azure/pom.xml'
- pattern: 'azure/**'
- jobs:
-# - '{project-name}-{stream}-verify-java'
-# - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- maven-goals: install
- mvn-params: '-P docker'
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-# name: multicloud-azure-arm64-java
-# project-name: 'multicloud-azure-arm64'
-# project: 'multicloud/azure'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-azure-settings'
-# subproject:
-# - 'azure':
-# pom: 'azure/pom.xml'
-# pattern: 'azure/**'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
-- project:
- name: multicloud-azure-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: '{sonar_mvn_goal}'
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'multicloud/azure'
- project-name: 'multicloud-azure'
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: multicloud-azure-java-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: multicloud/azure
- project-name: 'multicloud-azure'
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
-
-- project:
- name: multicloud-azure-info
- project-name: multicloud-azure
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: multicloud/azure
- branch: master
diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
deleted file mode 100644
index 8aec29b5e..000000000
--- a/jjb/multicloud/multicloud-azure-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: multicloud-azure-python
- project-name: 'multicloud-azure'
- project: 'multicloud/azure'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
- subproject:
- - 'azure':
- path: 'azure'
- pattern: 'azure/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/oom/oom-helm-legacy.yaml b/jjb/oom/oom-helm-legacy.yaml
new file mode 100644
index 000000000..e70dac9c6
--- /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 504f7f49a..3c1329a44 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 96f6625c1..09194f358 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -2,64 +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
- - '{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 de4ece0ab..b86fad4ef 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