[DMAAP-BC] Remove H branch from csit jobs

[ci-management.git] / jjb / aaf / aaf-cadi.yaml

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 29d4cd3..d8417ba 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -1,12 +1,17 @@
 ---
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-cadi
     project-name: 'aaf-cadi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
     project: 'aaf/cadi'
     stream:
       - 'master':
@@ -19,10 +24,15 @@
     name: aaf-cadi-shiro-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    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'
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
-    project-name: 'aaf-cadi'
+    project-name: 'aaf-cadi-shiro'
     branch: 'master'
     mvn-params: '-f shiro/pom.xml'
     mvn-settings: 'aaf-cadi-settings'
@@ -36,7 +46,9 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/fproxy/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
+    docker-image-name: 'onap/fproxy'
     stream:
       - 'master':
           branch: 'master'
@@ -48,8 +60,13 @@
     name: aaf-cadi-fproxy-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    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'
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
     project-name: 'aaf-cadi-fproxy'
     branch: 'master'
@@ -65,7 +82,9 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/rproxy/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
+    docker-image-name: 'onap/rproxy'
     stream:
       - 'master':
           branch: 'master'
@@ -77,8 +96,13 @@
     name: aaf-cadi-rproxy-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    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'
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/cadi'
     project-name: 'aaf-cadi-rproxy'
     branch: 'master'
@@ -94,10 +118,31 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/tproxy-config/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/cadi'
+    docker-image-name: 'onap/tproxy-config'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi'
+    branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+
+- project:
+    name: aaf-cadi-info
+    project-name: aaf-cadi
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: aaf/cadi
+    branch: master