Merge "Update latest release stream"
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 4d2239f..a265e84 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -4,10 +4,10 @@
jobs:
- '{project-name}-review-verification-maven-{stream}':
mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker'
+ mvn-params: '-Dmaven.test.skip=true -Dnexus.repository='
- '{project-name}-merge-verification-maven-{stream}':
mvn-goals: clean install
- mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker'
+ mvn-params: '-Dmaven.test.skip=true -Dnexus.repository='
project-name: 'cps'
recipients: 'toine.siebelink@est.tech'
# project name in gerrit
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 04306f3..cecfb79 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -38,7 +38,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
docker-pom: 'pom.xml'
- mvn-params: "-P cps-xnf-docker"
+ mvn-params: "-P cps-ncmp-docker"
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
@@ -46,7 +46,7 @@
- gerrit-maven-docker-stage:
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P cps-xnf-docker'
+ mvn-params: '-P cps-ncmp-docker'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
deleted file mode 100644
index 7da843a..0000000
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
- name: dmaap-buscontroller-csit
- jobs:
- - '{project-name}-{stream}-csit-{functionality}'
- - '{project-name}-{stream}-verify-csit-{functionality}'
- project-name: 'dmaap-buscontroller'
- recipients: 'fiachra.corcoran@est.tech'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'with_mr':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- - 'with_dr':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 2c3de53..5531bb9 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -9,7 +9,6 @@
name: dmaap-buscontroller-java11
project-name: 'dmaap-buscontroller'
jobs:
- - '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
@@ -22,6 +21,24 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk11
+
+- project:
+ name: dmaap-buscontroller-maintenance-java11
+ project-name: 'dmaap-buscontroller-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-goals: 'clean package -P docker docker:build docker:push'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/buscontroller'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -30,9 +47,46 @@
files: '**'
archive-artifacts: ''
java-version: openjdk11
+ cron: ''
-# removed sonar job from this template because this repo only builds a docker container
-# and the 0% coverage report from Sonar was causing repeated escalations.
+- project:
+ name: dmaap-buscontroller-csit
+ jobs:
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-P docker -DskipTests=true'
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-P docker'
+ project-name: 'dmaap-buscontroller'
+ recipients: 'fiachra.corcoran@est.tech'
+ project: 'dmaap/buscontroller'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ robot-options: ''
+
+- project:
+ name: dmaap-buscontroller-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: 'dmaap/buscontroller'
+ project-name: 'dmaap-buscontroller'
+ branch: 'master'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: dmaap-buscontroller-clm
@@ -43,6 +97,7 @@
project-name: 'dmaap-buscontroller'
branch: 'master'
mvn-settings: 'dmaap-buscontroller-settings'
+ java-version: openjdk11
- project:
name: dmaap-buscontroller-info
diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
deleted file mode 100644
index e991363..0000000
--- a/jjb/dmaap/dmaap-datarouter-csit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- 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'
- functionality:
- - 'ssl-dr-suite':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 8c77747..b79f2ed 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -17,6 +17,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk11
+
+- project:
+ name: dmaap-datarouter-maintenance-java11
+ project-name: 'dmaap-datarouter-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: 'clean package -P docker docker:build docker:push'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/datarouter'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -25,7 +44,23 @@
files: '**'
archive-artifacts: ''
java-version: openjdk11
+ cron: ''
+- project:
+ 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'
+ functionality:
+ - 'ssl-dr-suite':
+ trigger_jobs:
+ - '{project-name}-maven-docker-stage-{stream}'
+ robot-options: ''
- project:
name: dmaap-datarouter-sonar
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
deleted file mode 100644
index b61a15c..0000000
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
- name: dmaap-dbcapi-java11
- project-name: 'dmaap-dbcapi'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/dbcapi'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
- stream:
- - 'master':
- branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
- # due to a strange macro / variable translation problem this needs to be
- # passed as a string block to properly get the properties correctly defined
- # in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
-
-
-- project:
- name: dmaap-dbcapi-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: 'dmaap/dbcapi'
- project-name: 'dmaap-dbcapi'
- branch: 'master'
- mvn-settings: 'dmaap-dbcapi-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- java-version: openjdk11
-
-- project:
- name: dmaap-dbcapi-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: dmaap/dbcapi
- project-name: 'dmaap-dbcapi'
- branch: 'master'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
-
-- project:
- name: dmaap-dbcapi-info
- project-name: dmaap-dbcapi
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: dmaap/dbcapi
- branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-csit.yaml b/jjb/dmaap/dmaap-messagerouter-csit.yaml
deleted file mode 100644
index 109cbcc..0000000
--- a/jjb/dmaap/dmaap-messagerouter-csit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: dmaap-csit
- jobs:
- - '{project-name}-{stream}-csit-{functionality}'
- - '{project-name}-{stream}-verify-csit-{functionality}'
- project-name: 'dmaap'
- recipients: 'fiachra.corcoran@est.tech'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'mrpubsub':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index b1855ea..c43a685 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: dmaap-messagerouter-dmaapclient
- project-name: 'dmaap-messagerouter-dmaapclient'
+ name: dmaap-messagerouter-dmaapclient-java11
+ project-name: 'dmaap-messagerouter-dmaapclient-java11'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk11
+
+- project:
+ name: dmaap-messagerouter-dmaapclient-maintenance
+ project-name: 'dmaap-messagerouter-dmaapclient-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ project: 'dmaap/messagerouter/dmaapclient'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -22,6 +39,7 @@
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
files: '**'
archive-artifacts: ''
+ cron: ''
- project:
name: dmaap-messagerouter-dmaapclient-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index e469a1d..42c312b 100644
--- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -17,6 +17,24 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-kafka11aaf-settings'
+ files: '**'
+ archive-artifacts: ''
+
+- project:
+ name: dmaap-kafka-maintenance
+ project-name: 'dmaap-kafka-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/kafka11aaf'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -24,6 +42,7 @@
mvn-settings: 'dmaap-kafka11aaf-settings'
files: '**'
archive-artifacts: ''
+ cron: ''
- project:
name: dmaap-kafka-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 64e9405..ddd8c40 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,14 +1,10 @@
---
- project:
- name: dmaap-messagerouter-messageservice
- project-name: 'dmaap-messagerouter-messageservice'
+ name: dmaap-messagerouter-messageservice-java-11
+ project-name: 'dmaap-messagerouter-messageservice-java-11'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-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
mvn-params: '-P docker -Dmaven.test.skip=true'
@@ -21,6 +17,27 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+
+- project:
+ name: dmaap-messagerouter-messageservice-maintenance
+ project-name: 'dmaap-messagerouter-messageservice-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/messagerouter/messageservice'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -30,6 +47,23 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ cron: ''
+
+- project:
+ name: dmaap-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ project-name: 'dmaap'
+ recipients: 'fiachra.corcoran@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'mrpubsub':
+ trigger_jobs:
+ - '{project-name}-maven-docker-stage-{stream}'
+ robot-options: ''
- project:
name: dmaap-messagerouter-messageservice-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index e5dd588..1d476f9 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -11,11 +11,26 @@
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/messagerouter/mirroragent'
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+ files: '**'
+ archive-artifacts: ''
+
+- project:
+ name: dmaap-messagerouter-mirroragent-maintenance
+ project-name: 'dmaap-messagerouter-mirroragent-maintenance'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true8g
+ project: 'dmaap/messagerouter/mirroragent'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -23,6 +38,7 @@
mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
files: '**'
archive-artifacts: ''
+ cron: ''
- project:
name: dmaap-messagerouter-mirroragent-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 1772783..d3e388d 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: dmaap-messagerouter-msgrtr
- project-name: 'dmaap-messagerouter-msgrtr'
+ name: dmaap-messagerouter-msgrtr-java-11
+ project-name: 'dmaap-messagerouter-msgrtr-java-11'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -11,11 +11,27 @@
maven-versions-plugin: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/messagerouter/msgrtr'
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+
+- project:
+ name: dmaap-messagerouter-msgrtr
+ project-name: 'dmaap-messagerouter-msgrtr'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
+ project: 'dmaap/messagerouter/msgrtr'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -23,6 +39,7 @@
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
files: '**'
archive-artifacts: ''
+ cron: ''
- project:
name: dmaap-messagerouter-msgrtr-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index d704af6..3258275 100644
--- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -15,6 +15,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-zookeeper-settings'
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ build-node: ubuntu1804-docker-8c-8g
+
+- project:
+ name: dmaap-zookeeper-maintenance
+ project-name: 'dmaap-zookeeper-maintenance'
+ jobs:
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/zookeeper'
+ stream:
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -25,6 +44,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
build-node: ubuntu1804-docker-8c-8g
+ cron: ''
- project:
name: dmaap-zookeeper-info
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 94f6def..94d9d3a 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -23,6 +23,10 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 8532258..2b6aeef 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -21,6 +21,10 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
mvn-settings: 'holmes-engine-management-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 9aa9c9d..00791b1 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -21,6 +21,10 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
mvn-settings: 'holmes-rule-management-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 9ca248c..d10b0f0 100644
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -18,12 +18,12 @@
# Make sure pip itself us up-to-date.
pip install --upgrade pip
-pip install --upgrade --no-binary pycparser pycparser
-pip install --upgrade pyOpenSSL==16.2.0 docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library,xvfb}}
+pip install --no-binary pycparser==2.20 pycparser==2.20
+pip install pyOpenSSL==16.2.0 docker-py==1.10.6 importlib==1.0.4 requests==2.25.1 scapy==2.4.4 netifaces==0.10.9 netaddr==0.8.0 ipaddr==2.2.0 simplejson==3.17.2 demjson==2.2.4
+pip install robotframework-httplibrary==0.4.2 robotframework-requests==0.8.2 robotframework-sshlibrary==3.6.0 robotframework-selenium2library==1.8.0 robotframework-xvfb==1.2.2
-pip install xvfbwrapper
-pip install PyVirtualDisplay
+pip install xvfbwrapper==0.2.9
+pip install PyVirtualDisplay==2.1
# Print installed versions.
pip freeze
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 6d2c882..5ac5d8d 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -43,6 +43,8 @@
branch: 'frankfurt'
- 'guilin':
branch: 'guilin'
+ - 'honolulu':
+ branch: 'honolulu'
- project:
name: integration-xtesting-release
@@ -111,6 +113,9 @@
- 'master':
branch: 'master'
files: ''
+ - 'honolulu':
+ branch: 'honolulu'
+ files: ''
- 'guilin':
branch: 'guilin'
files: ''
diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
index d3b5dde..c1aa85e 100644
--- a/jjb/multicloud/multicloud-info.yaml
+++ b/jjb/multicloud/multicloud-info.yaml
@@ -27,3 +27,11 @@
project: multicloud/oom
branch: master
+- project:
+ name: multicloud-k8s-info
+ project-name: multicloud-k8s
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: multicloud/k8s
+ branch: master
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index dd43c95..8804725 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -26,6 +26,8 @@
stream:
- 'master':
branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
mvn-settings: 'multicloud-k8s-settings'
files: '**'
archive-artifacts: ''
@@ -52,12 +54,3 @@
# files: '**'
# archive-artifacts: ''
# build-node: ubuntu1804-docker-arm64-4c-2g
-
-- project:
- name: multicloud-k8s-info
- project-name: multicloud-k8s
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: multicloud/k8s
- branch: master
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index dd41c92..5a723e4 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -1,14 +1,17 @@
- project:
name: optf-has-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-goals: clean install
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-goals: clean install
project-name: optf-has
recipients: 'snarayanan@research.att.com'
+ project: optf/has
stream:
- 'master':
branch: 'master'
- functionality:
- - 'has':
- trigger_jobs:
+ - 'honolulu':
+ branch: 'honolulu'
+ mvn-settings: 'optf-has-settings'
robot-options: ''
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index e142b23..9398122 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -1,14 +1,17 @@
- project:
name: optf-osdf-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-goals: clean install
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-goals: clean install
project-name: optf-osdf
recipients: 'snarayanan@research.att.com'
+ project: optf/osdf
stream:
- 'master':
branch: 'master'
- functionality:
- - 'osdf':
- trigger_jobs:
+ - 'honolulu':
+ branch: 'honolulu'
+ mvn-settings: 'optf-osdf-settings'
robot-options: ''
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 6b9da14..c4fcc36 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -5,7 +5,7 @@
- '{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'
+ mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only'
build-node: 'ubuntu1804-docker-8c-16g'
archive-artifacts: >
**/*.log
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index ee0fe87..0fa71be 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -29,13 +29,13 @@
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/'
+ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
build-node: 'ubuntu1804-docker-8c-8g'
- '{project-name}-{stream}-sdc-merge-java':
build-node: 'ubuntu1804-docker-8c-16g'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
# 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: >
@@ -51,11 +51,11 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-v1-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -113,7 +113,7 @@
branch: 'master'
mvn-settings: 'sdc-settings'
java-version: openjdk11
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
@@ -123,7 +123,7 @@
- gerrit-maven-clm:
build-timeout: 120
submodule-timeout: 30
- mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
nexus-iq-namespace: 'onap-'
project: sdc
project-name: 'sdc'