Merge "Add info job for modeling/modelspec"
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
deleted file mode 100644
index 8d65de8..0000000
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
-- project:
- name: aaf-luaplugin-clm
- project-name: 'aaf-luaplugin'
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'aaf/luaplugin'
- branch: 'master'
- mvn-settings: 'aaf-luaplugin-settings'
-
-- project:
- name: aaf-luaplugin-info
- project-name: aaf-luaplugin
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: aaf/luaplugin
- branch: master
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
deleted file mode 100644
index 5997543..0000000
--- a/jjb/aaf/aaf-sms.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
-- project:
- name: aaf-sms
- project-name: 'aaf-sms'
- subproject: 'aaf-sms-client'
- path: 'sms-service/src'
- golangver: 'golang111'
- jobs:
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- - '{project-name}-{stream}-verify-golang'
- - '{project-name}-{stream}-merge-golang'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- mvn-pom: 'sms-client/java/pom.xml'
- mvn-params: '-f sms-client/java/pom.xml'
- - '{project-name}-{stream}-docker-golang-shell-daily':
- script:
- !include-raw-escape: 'build-sms-docker-image.sh'
- project: 'aaf/sms'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'aaf-sms-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: aaf-sms-info
- project-name: aaf-sms
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: aaf/sms
- branch: master
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
deleted file mode 100644
index b3a45fb..0000000
--- a/jjb/aaf/aaf-sshsm.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
-- project:
- name: aaf-sshsm
- project-name: 'aaf-sshsm'
- build-timeout: 120
- project: 'aaf/sshsm'
- jobs:
- - gerrit-verify-c:
- script:
- !include-raw-escape: 'build-sshsm.sh'
- - gerrit-docker-c-shell-daily:
- script:
- !include-raw-escape: 'build-sshsm-docker-images.sh'
- stream:
- - 'master':
- branch: 'master'
-
- mvn-settings: 'aaf-sshsm-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: aaf-sshsm-info
- project-name: aaf-sshsm
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: aaf/sshsm
- branch: master
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
deleted file mode 100644
index 26764c6..0000000
--- a/jjb/appc/appc-cdt.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
- name: appc-cdt
- project-name: 'appc-cdt'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
- project: 'appc/cdt'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'appc-cdt-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: appc-cdt-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: 'appc/cdt'
- project-name: 'appc-cdt'
- branch: 'master'
- mvn-settings: 'appc-cdt-settings'
-
-
-- project:
- name: appc-cdt-info
- project-name: appc-cdt
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: appc/cdt
- branch: master
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
deleted file mode 100644
index edffd6b..0000000
--- a/jjb/appc/appc-deployment.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-
-- project:
- name: appc-deployment
- project-name: 'appc-deployment'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
-
- project: 'appc/deployment'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'appc-deployment-settings'
- maven-version: "mvn35"
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
- mvn-profile: docker
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: appc-deployment-docker
- project-name: 'appc-deployment'
- jobs:
- - 'docker-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
- - 'docker-version-java-daily':
- mvn-params: '-Dmaven.test.skip=true'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- mvn-params: '-Dmaven.test.skip=true -P docker'
- maven-versions-plugin: true
- mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'appc/deployment'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'appc-deployment-settings'
- maven-version: "mvn35"
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
- mvn-profile: docker
- build-node: ubuntu1804-docker-8c-8g
-
-#- project:
-# name: appc-deployment-arm64-docker
-# project-name: 'appc-deployment-arm64'
-# jobs:
-# - 'docker-java-daily':
-# mvn-params: '-Dmaven.test.skip=true'
-# - 'docker-version-java-daily':
-# mvn-params: '-Dmaven.test.skip=true'
-# project: 'appc/deployment'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'appc-deployment-settings'
-# files: '**'
-# archive-artifacts: ''
-# docker-pom: 'pom.xml'
-# mvn-profile: docker
-# build-node: ubuntu1804-docker-arm64-4c-2g
-
-- project:
- name: appc-deployment-info
- project-name: appc-deployment
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: appc/deployment
- branch: master
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
deleted file mode 100644
index c717284..0000000
--- a/jjb/appc/appc-parent.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
- name: appc-project-view
- project-name: appc
- views:
- - project-view
-
-- project:
- name: appc-parent
- project-name: 'appc-parent'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-docker-8c-8g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
- project: 'appc/parent'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'appc-parent-settings'
- maven-version: "mvn35"
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: appc-parent-info
- project-name: appc-parent
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: appc/parent
- branch: master
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/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 68bffef..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
@@ -51,6 +50,45 @@
cron: ''
- 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
jobs:
- gerrit-maven-clm
@@ -59,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 de41a48..b79f2ed 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -47,6 +47,22 @@
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
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
deleted file mode 100644
index c711ecb..0000000
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ /dev/null
@@ -1,86 +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'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
-
-- project:
- name: dmaap-dbcapi-java11-maintenance
- project-name: 'dmaap-dbcapi-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/dbcapi'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
- stream:
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- cron: ''
-
-- 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 c43a685..3e7ba92 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -58,6 +58,7 @@
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-dmaapclient-clm
@@ -68,6 +69,7 @@
project-name: 'dmaap-messagerouter-dmaapclient'
branch: 'master'
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-dmaapclient-info
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 9190793..9ad2d2e 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -50,6 +50,22 @@
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
jobs:
- gerrit-maven-sonar
@@ -66,6 +82,7 @@
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-messageservice-clm
@@ -76,6 +93,7 @@
project-name: 'dmaap-messagerouter-messageservice'
branch: 'master'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-messageservice-info
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index d3e388d..69dee31 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -58,6 +58,7 @@
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-msgrtr-clm
@@ -68,6 +69,7 @@
project-name: 'dmaap-messagerouter-msgrtr'
branch: 'master'
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+ java-version: openjdk11
- project:
name: dmaap-messagerouter-msgrtr-info
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/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
deleted file mode 100644
index 5f2c154..0000000
--- a/jjb/music/music-mdbc.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
- name: music-mdbc
- project-name: 'music-mdbc'
- 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: 'music/mdbc'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'music-mdbc-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
- name: music-mdbc-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: music/mdbc
- project-name: 'music-mdbc'
- branch: 'master'
- mvn-settings: 'music-mdbc-settings'
-
-- project:
- name: music-mdbc-info
- project-name: music-mdbc
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: music/mdbc
- branch: master
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
deleted file mode 100644
index 93ffe45..0000000
--- a/jjb/music/music-prom.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
- name: music-prom
- project-name: 'music-prom'
- 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
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- project: 'music/prom'
- stream:
- - 'master':
- branch: 'master'
- - 'casablanca':
- branch: 'casablanca'
- mvn-settings: 'music-prom-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-
-- project:
- name: music-prom-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: music/prom
- project-name: 'music-prom'
- branch: 'master'
- mvn-settings: 'music-prom-settings'
-
-- project:
- name: music-prom-info
- project-name: music-prom
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: music/prom
- branch: master
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
deleted file mode 100644
index 0d15236..0000000
--- a/jjb/music/music.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-- project:
- name: music-project-view
- project-name: music
- views:
- - project-view
-
-- project:
- name: music
- project-name: 'music'
- 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
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'music'
- stream:
- - 'master':
- branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'music-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: music-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: 'music'
- project-name: 'music'
- branch: 'master'
- mvn-settings: 'music-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
- name: music-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: music
- project-name: 'music'
- branch: 'master'
- mvn-settings: 'music-settings'
-
-- project:
- name: music-info
- project-name: music
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: music
- branch: master
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index fc89d02..71ab433 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
+ - 'honolulu':
+ branch: 'honolulu'
jobs:
- '{project-name}-{stream}-review':
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'