CI: Remove Jenkins gerrit-info-yaml-verify job

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

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 2accf99..9fc5fe0 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -7,69 +7,67 @@
 
 - project:
     name: aai-graphadmin-master
-    project-name: 'aai-graphadmin'
+    project-name: "aai-graphadmin"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           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'
-          build-node: ubuntu1604-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
-    project: 'aai/graphadmin'
+          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-2c-1g
+    project: "aai/graphadmin"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+      - "jakarta":
+          branch: "jakarta"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-version: "mvn35"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-graphadmin-sonar
     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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/graphadmin'
-    project-name: 'aai-graphadmin'
-    branch: 'master'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    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-builder-4c-4g
+    project: "aai/graphadmin"
+    project-name: "aai-graphadmin"
+    branch: "master"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-version: "mvn35"
+    java-version: openjdk8
 
 - project:
     name: aai-graphadmin-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/graphadmin'
-    project-name: 'aai-graphadmin'
+    nexus-iq-namespace: "onap-"
+    project: "aai/graphadmin"
+    project-name: "aai-graphadmin"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-version: 'mvn35'
-
-- project:
-    name: aai-graphadmin-info
-    project-name: aai-graphadmin
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/graphadmin
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-version: "mvn35"
+    java-version: openjdk8