X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-resources.yaml;h=afb63d854b5a9f6488087a09e5b33b67869c0c63;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=b8eb752b0e2b2d0eabb57c6d5306d0b5e1a16ae1;hpb=786430fd064efc8b11ad90e58929debb7cfb5e21;p=ci-management.git

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b8eb752b0..afb63d854 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -7,36 +7,39 @@
 
 - project:
     name: aai-resources
-    project-name: 'aai-resources'
+    project-name: "aai-resources"
     jobs:
-      - '{project-name}-{stream}-verify-java':
+      - "{project-name}-{stream}-verify-java":
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-{stream}-merge-java':
+      - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
-          mvn-params: '-DskipTests'
+          mvn-params: "-DskipTests"
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          mvn-params: '-P docker -Dmaven.test.skip=true'
+          sbom-generator: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
           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':
-          build-node: centos7-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'aai/resources'
+    project: "aai/resources"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'aai-resources-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+      - "jakarta":
+          branch: "jakarta"
+    mvn-settings: "aai-resources-settings"
+    mvn-version: "mvn35"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
@@ -45,55 +48,30 @@
     jobs:
       - 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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'aai/resources'
-    project-name: 'aai-resources'
-    branch: 'master'
-    mvn-settings: 'aai-resources-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    project: "aai/resources"
+    project-name: "aai-resources"
+    branch: "master"
+    mvn-settings: "aai-resources-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-version: "mvn35"
     java-version: openjdk8
 
 - project:
     name: aai-resources-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/resources'
-    project-name: 'aai-resources'
+    nexus-iq-namespace: "onap-"
+    project: "aai/resources"
+    project-name: "aai-resources"
     stream:
-        - 'master':
-              branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
-    mvn-settings: 'aai-resources-settings'
-    mvn-version: 'mvn35'
-    java-version: openjdk8
-
-- project:
-    name: aai-resources-info
-    project-name: aai-resources
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: aai/resources
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-resources-settings"
+    mvn-version: "mvn35"
     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