Merge "update dmaap mr UBuntu buld nodes to 18.04"

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

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 9923764..341547a 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -5,6 +5,7 @@
     views:
       - project-view
 
+# Note: 202003, LF says ubuntu1604 is deprecated.  Use ubuntu1804 when needed
 - project:
     name: aaf-authz
     project-name: 'aaf-authz'
@@ -15,13 +16,20 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install'
-          settings: '{mvn-settings}'
-          script:
-            !include-raw-escape: 'build-aaf-docker-image.sh'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+# LF said on 2019-08-01 that this was deprecated
+#      - '{project-name}-{stream}-docker-java-shell-daily':
+#          mvn-goals: 'clean install'
+#          settings: '{mvn-settings}'
+#          script:
+#            !include-raw-escape: 'build-aaf-docker-image.sh'
+#          build-node: ubuntu1804-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
@@ -40,7 +48,7 @@
 #          settings: '{mvn-settings}'
 #          script:
 #            !include-raw-escape: 'build-aaf-docker-image.sh'
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: ubuntu1804-docker-arm64-4c-2g'
 #    project: 'aaf/authz'
 #    stream:
 #      - 'master':
@@ -53,8 +61,13 @@
     name: aaf-authz-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: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aaf/authz'
     project-name: 'aaf-authz'
     branch: 'master'
@@ -77,5 +90,6 @@
     project-name: aaf-authz
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: aaf/authz
     branch: master