Chore: Add 2c Centos 7 and 8 nodes

[ci-management.git] / jjb / aai / aai-resources.yaml

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 6ffc423..5a4f5e8 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -31,13 +31,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -46,7 +48,6 @@
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
@@ -70,8 +71,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     java-version: openjdk8
@@ -85,15 +84,3 @@
     project: aai/resources
     branch: master
     java-version: openjdk8
-
-- project:
-    name: 'aai-resources-whitesource'
-    project-name: 'aai-resources'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-resources-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/resources'
-    branch: master