X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faaf%2Faaf-cadi.yaml;h=d8417badfc1931dfbdc07e2b640fefbb005b7f97;hb=ce1e7917522f74fd45f43518ae5e285f9e3ac0d9;hp=4f37c5249fcf1abbd6c0208693b16ab853c32ba8;hpb=adfabfb88b6d590267a1ab203bfdc5e75a70d6e2;p=ci-management.git

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 4f37c5249..d8417badf 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -1,10 +1,13 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-cadi
     project-name: 'aaf-cadi'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
@@ -27,7 +30,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 +46,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 +66,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 +82,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 +102,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 +118,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:
@@ -140,5 +143,6 @@
     project-name: aaf-cadi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/cadi
     branch: master