Merge "[OOM] Clean up old jobs"
diff --git a/INFO.yaml b/INFO.yaml
index 801bb85..bf38e97 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -61,5 +61,10 @@
company: 'samsung'
id: 'kaihlavi'
timezone: 'Europe/Helsinki'
+ - name: 'Kevin Sandi'
+ email: 'ksandi@contractor.linuxfoundation.org'
+ company: 'LF'
+ id: 'kevin.sandi'
+ timezone: 'America/Costa_Rica'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
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/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)."