X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-resources.yaml;h=378dd34495e8c6e430553209baf45bb87a885161;hb=2197d45863af3496355dda957fabed01be445a8f;hp=8b3d49ea3db9631a3021e281081687b2efd89870;hpb=7177f06b4bf62b75d144515f6d44c258e11d3b2f;p=ci-management.git

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 8b3d49ea3..378dd3449 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -10,9 +10,9 @@
     project-name: 'aai-resources'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
@@ -21,7 +21,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -37,7 +37,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -50,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
@@ -70,8 +70,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     java-version: openjdk8
@@ -89,7 +87,7 @@
 - project:
     name: 'aai-resources-whitesource'
     project-name: 'aai-resources'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-resources-settings'