Merge "Chore: Promote Kevin as committer"
diff --git a/global-jjb b/global-jjb
index cc281da..18d90a9 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit cc281dac5f29fec045c7332094d55faa98acd924
+Subproject commit 18d90a9e0b74515b6aa2ac8fc4a17b9d98a7680e
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index deb6a44..f72d6cc 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis - - 150380303-3006
+IMAGE_NAME=CentOS 7 - redis - - 50880808-8011
LABELS=centos7-redis-4c-4g
HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 829f8d1..50b2941 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,4 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20220412-140603.676
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20220420-200651.484
LABELS=ubuntu1804-helm-2c-1g
-HARDWARE_ID=v3-standard-2
-VOLUME_SIZE=50
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
index 6ba05c6..5d9d9f9 100644
--- a/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/oom-settings/serverCredentialMappings.yaml
@@ -16,3 +16,5 @@
credentialsId: *cred
- serverId: "docker.io"
credentialsId: "onap_dockerhub_creds"
+ - serverId: "oom-helm"
+ credentialsId: "oom"
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 6623edd..d56a6e4 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -25,8 +25,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
mvn-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 59e4bf7..3def2f3 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -8,8 +8,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 5778cb5..af49108 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -8,8 +8,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
# apply to all jobs
java-version: openjdk11
project: 'dcaegen2/collectors/hv-ves'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 31c2a67..9c6d8cf 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -24,8 +24,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 799fd78..a253c12 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -10,8 +10,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 7fa8ef5..b37d40c 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -25,8 +25,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-collectors-ves-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 1421ef0..6345f73 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -14,8 +14,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 369e6f4..bb4cd6c 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -97,8 +97,8 @@
branch: master
- istanbul:
branch: istanbul
- - honolulu:
- branch: honolulu
+ - jakarta:
+ branch: jakarta
views:
- project-view:
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index fc8539c..59c7312 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -17,8 +17,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index b5af558..2787f50 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -15,10 +15,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index 299c042..d4e41d6 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -15,10 +15,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
index 6840746..a34faf3 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -24,7 +24,9 @@
stream:
- 'master':
branch: 'master'
- java-version: openjdk11
+ - 'jakarta':
+ branch: 'jakarta'
+ java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
maven-version: 'mvn35'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 2fd96bd..8641760 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -22,10 +22,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 837e17d..e7b05d2 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -15,8 +15,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
maven-version: 'mvn35'
mvn-settings: 'dcaegen2-services-settings'
@@ -50,8 +50,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
@@ -84,8 +84,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
@@ -118,8 +118,8 @@
branch: 'master'
- 'istanbul':
branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 0c52bae..9eb155b 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -109,6 +109,8 @@
branch: master
- istanbul:
branch: istanbul
+ - jakarta:
+ branch: jakarta
views:
- project-view:
project-name: dcaegen2-services-pmsh
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 82ee025..cb616bf 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-services-heartbeat-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index 3308f7e..232a499 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 31a6bc5..dd6dab7 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -22,10 +22,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 409e5f8..7b54460 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,10 +6,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 0135244..5399481 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -20,10 +20,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 7f43758..1e61d4a 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -16,10 +16,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-sdk-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index d6956ca..e040b72 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
files: '**'
@@ -47,8 +47,6 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index d6b9c76..2b0e443 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -21,10 +21,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 624f74d..fca7af2 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dcaegen2-utils-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index cf65da2..46c501e 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
+ - 'jakarta':
+ branch: 'jakarta'
- 'istanbul':
branch: 'istanbul'
mvn-settings: 'dcaegen2-settings'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index a89f6bd..b74439e 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,7 +6,7 @@
- project-view
- project:
- name: dmaap-buscontroller-java11
+ name: dmaap-buscontroller-java
project-name: 'dmaap-buscontroller'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -22,35 +22,14 @@
stream:
- 'master':
branch: 'master'
+ - 'jakarta':
+ branch: 'jakarta'
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 -DskipTests=true'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- project: 'dmaap/buscontroller'
- stream:
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'dmaap-buscontroller-settings'
- files: '**'
- archive-artifacts: ''
- java-version: openjdk11
- cron: ''
-
-- project:
name: dmaap-buscontroller-csit
jobs:
- '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 1a8f5ff..530a7b2 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: dmaap-datarouter-java11
+ name: dmaap-datarouter-java
project-name: 'dmaap-datarouter'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -17,36 +17,14 @@
stream:
- 'master':
branch: 'master'
+ - 'jakarta':
+ branch: 'jakarta'
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:
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
- java-version: openjdk11
- cron: ''
-
-- project:
name: dmaap-datarouter-csit-ssl
jobs:
- '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 8e0dbf6..34fe57b 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: dmaap-messagerouter-dmaapclient-java11
- project-name: 'dmaap-messagerouter-dmaapclient-java11'
+ name: dmaap-messagerouter-dmaapclient-java
+ project-name: 'dmaap-messagerouter-dmaapclient-java'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -15,33 +15,14 @@
stream:
- 'master':
branch: 'master'
+ - 'jakarta':
+ branch: 'jakarta'
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:
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
- files: '**'
- archive-artifacts: ''
- cron: ''
-
-- project:
name: dmaap-messagerouter-dmaapclient-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index ff785c5..8b404ea 100644
--- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -23,29 +23,6 @@
java-version: openjdk11
- 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:
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'dmaap-kafka11aaf-settings'
- files: '**'
- archive-artifacts: ''
- cron: ''
-
-- project:
name: dmaap-kafka-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 8320488..a679666 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: dmaap-messagerouter-messageservice-java-11
- project-name: 'dmaap-messagerouter-messageservice-java-11'
+ name: dmaap-messagerouter-messageservice-java
+ project-name: 'dmaap-messagerouter-messageservice-java'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'jakarta':
+ branch: 'jakarta'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
java-version: openjdk11
files: '**'
@@ -25,30 +27,6 @@
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:
- - 'istanbul':
- branch: 'istanbul'
- mvn-settings: 'dmaap-messagerouter-messageservice-settings'
- java-version: openjdk11
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- cron: ''
-
-- project:
name: dmaap-csit
jobs:
- '{project-name}-review-verification-maven-{stream}':
diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 8186cc3..bb778ac 100644
--- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -23,30 +23,6 @@
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:
- - 'istanbul':
- branch: 'istanbul'
- - 'honolulu':
- branch: 'honolulu'
- mvn-settings: 'dmaap-zookeeper-settings'
- files: '**'
- archive-artifacts: ''
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- build-node: ubuntu1804-docker-8c-8g
- cron: ''
-
-- project:
name: dmaap-zookeeper-info
project-name: dmaap-zookeeper
jobs:
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 43f0db8..e4eff9d 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -4,6 +4,7 @@
project-name: sdc-sdc-workflow
views:
- project-view
+ java-version: openjdk11
- project:
name: sdc-sdc-workflow-designer
@@ -23,6 +24,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
+ java-version: openjdk11
project: 'sdc/sdc-workflow-designer'
stream:
@@ -56,6 +58,7 @@
mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m'
+ java-version: openjdk11
- project:
name: sdc-sdc-workflow-designer-clm
@@ -71,6 +74,7 @@
- 'jakarta':
branch: 'jakarta'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
+ java-version: openjdk11
- project:
name: sdc-sdc-workflow-designer-info
@@ -80,3 +84,4 @@
build-node: centos7-builder-2c-1g
project: sdc/sdc-workflow-designer
branch: master
+ java-version: openjdk11
diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index 0befe7b..edf34bb 100644
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -13,7 +13,7 @@
- 'pnf-sw-upgrade':
trigger_jobs:
robot-options: ''
- cron: ''
+ disabled: 'true'
- project:
name: usecases-config-over-netconf
diff --git a/packer/common-packer b/packer/common-packer
index 3dcae18..cb6e121 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe
+Subproject commit cb6e121196cfd33a9a4348368f34d2c37e152bfd
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 1c78671..46b9258 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -19,24 +19,24 @@
mode: 0775
become: yes
- - name: 'Install Helm 3.6 {{helm3_6_version}}'
+ - name: 'Install Helm3.6 {{helm3_6_version}}'
block:
- - name: 'Create directory /tmp/helm3_6'
+ - name: 'Create directory /tmp/helm3.6'
file:
- path: /tmp/helm3_6
+ path: /tmp/helm3.6
state: directory
- name: 'Fetch tar.gz for Helm 3.6'
get_url:
url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
- dest: /tmp/helm3_6
+ dest: /tmp/helm3.6
- name: 'Unarchive Helm 3.6'
unarchive:
- src: "/tmp/helm3_6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
- dest: /tmp/helm3_6
+ src: "/tmp/helm3.6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
+ dest: /tmp/helm3.6
remote_src: true
become: yes
- name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable'
- command: 'mv /tmp/helm3_6/linux-amd64/helm /usr/local/bin/helm3.6'
+ command: 'mv /tmp/helm3.6/linux-amd64/helm /usr/local/bin/helm3.6'
become: yes
- name: 'Check Helm 3.6'
command: 'which helm3.6'
@@ -45,7 +45,7 @@
- name: 'Install Helm 3.6'
shell: |
- echo "----> Installing helm 3.6"
+ echo "----> Installing helm3.6"
wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
mv linux-amd64/helm /usr/local/bin/helm3.6
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 9568c01..cdf752a 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -1,6 +1,7 @@
{
"variables": {
"ansible_roles_path": ".galaxy",
+ "arch": "x86_64",
"base_image": null,
"distro": null,
"cloud_auth_url": null,
@@ -9,6 +10,7 @@
"cloud_network": null,
"cloud_tenant": null,
"cloud_user_data": null,
+ "flavor": "v3-standard-2",
"ssh_user": null,
"ssh_proxy_host": ""
},
@@ -31,7 +33,7 @@
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
- "flavor": "v1-standard-1",
+ "flavor": "{{user `flavor`}}",
"metadata": {
"ci_managed": "yes"
}
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 6cdab9d..6554fb6 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -1,6 +1,7 @@
{
"variables": {
"ansible_roles_path": ".galaxy",
+ "arch": "x86_64",
"base_image": null,
"distro": null,
"cloud_auth_url": null,
@@ -9,6 +10,7 @@
"cloud_network": null,
"cloud_tenant": null,
"cloud_user_data": null,
+ "flavor": "v3-standard-2",
"ssh_user": null,
"ssh_proxy_host": ""
},
@@ -30,7 +32,7 @@
"user_data_file": "{{user `cloud_user_data`}}",
"ssh_username": "{{user `ssh_user`}}",
"ssh_proxy_host": "{{user `ssh_proxy_host`}}",
- "flavor": "v1-standard-1",
+ "flavor": "{{user `flavor`}}",
"metadata": {
"ci_managed": "yes"
}
diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
index be0fa96..4cc27fe 100755
--- a/shell/publish_helm_charts.sh
+++ b/shell/publish_helm_charts.sh
@@ -22,7 +22,7 @@
;;
'release')
echo " * release build, pushing to https://nexus3.onap.org/repository/onap-helm-release/"
- curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
+ curl -vn --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
;;
*)
echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."