Merge "Move AAF build to Ubuntu 1804"
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index c94118e..c563c83 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -5,6 +5,7 @@
views:
- project-view
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-authz
project-name: 'aaf-authz'
@@ -19,7 +20,7 @@
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu0804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
# LF said on 2019-08-01 that this was deprecated
@@ -28,7 +29,7 @@
# settings: '{mvn-settings}'
# script:
# !include-raw-escape: 'build-aaf-docker-image.sh'
-# build-node: 'ubuntu1604-docker-8c-8g'
+# build-node: ubuntu1804-docker-8c-8g'
project: 'aaf/authz'
stream:
- 'master':
@@ -47,7 +48,7 @@
# settings: '{mvn-settings}'
# script:
# !include-raw-escape: 'build-aaf-docker-image.sh'
-# build-node: 'ubuntu1804-docker-arm64-4c-2g'
+# build-node: ubuntu1804-docker-arm64-4c-2g'
# project: 'aaf/authz'
# stream:
# - 'master':
@@ -66,7 +67,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/authz'
project-name: 'aaf-authz'
branch: 'master'
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 65fb395..64b3bc3 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-cadi
project-name: 'aaf-cadi'
@@ -27,7 +28,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-shiro'
branch: 'master'
@@ -43,7 +44,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/fproxy/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/fproxy'
stream:
@@ -63,7 +64,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-fproxy'
branch: 'master'
@@ -79,7 +80,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/rproxy/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/rproxy'
stream:
@@ -99,7 +100,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'aaf/cadi'
project-name: 'aaf-cadi-rproxy'
branch: 'master'
@@ -115,7 +116,7 @@
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'sidecar/tproxy-config/pom.xml'
mvn-goals: 'docker:build'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'aaf/cadi'
docker-image-name: 'onap/tproxy-config'
stream:
diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
index 68077b7..9f3b179 100644
--- a/jjb/aaf/aaf-certservice-csit.yaml
+++ b/jjb/aaf/aaf-certservice-csit.yaml
@@ -1,3 +1,4 @@
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-certservice-csit
jobs:
diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 3b4f67b..69a24a8 100644
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-certservice
project-name: 'aaf-certservice'
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
index 20bf1c8..8d65de8 100644
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-luaplugin-clm
project-name: 'aaf-luaplugin'
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index a69daaf..88932f1 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-sms
project-name: 'aaf-sms'
@@ -24,7 +25,7 @@
mvn-settings: 'aaf-sms-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aaf-sms-info
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 1178902..b3a45fb 100644
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -1,4 +1,5 @@
---
+# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed
- project:
name: aaf-sshsm
project-name: 'aaf-sshsm'
@@ -18,7 +19,7 @@
mvn-settings: 'aaf-sshsm-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: aaf-sshsm-info