X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faaf%2Faaf-authz.yaml;h=a4b04d2facba259a65afa353aa7d00347f0eaed5;hb=982acb55cc3712363ed1180af83dcf3c13b241c3;hp=5d5774894074b6dabcf16db23c6efb4455f14807;hpb=46b6edb7eefc3a4b4444544ac80f3cbc3441b6ef;p=ci-management.git

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 5d5774894..a4b04d2fa 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -1,33 +1,88 @@
 ---
+- project:
+    name: aaf-project-view
+    project-name: aaf
+    views:
+      - project-view
+
 - project:
     name: aaf-authz
     project-name: 'aaf-authz'
     jobs:
-      - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-goals: 'docker:build'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
+      - gerrit-maven-docker-stage:
+          mvn-params: 'exec:exec -Pbuild-docker'
+          build-node: ubuntu1604-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: 'ubuntu1604-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aaf-authz-settings'
-    mvn-profile: docker
-    docker-pom: 'authz-service/pom.xml'
     files: '**'
     archive-artifacts: ''
+
+# This was not cleared with PTL, nor is it appropriate to add for CasaBlanca  See PTL before adding this kind of thing
+#- project:
+#    name: aaf-authz-arm64
+#    project-name: 'aaf-authz-arm64'
+#    jobs:
+#      - '{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-arm64-4c-2g'
+#    project: 'aaf/authz'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'aaf-authz-settings'
+#    files: '**'
+#    archive-artifacts: ''
+
 - project:
     name: aaf-authz-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aaf/authz'
     project-name: 'aaf-authz'
     branch: 'master'
     mvn-settings: 'aaf-authz-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-authz-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aaf/authz'
+    project-name: 'aaf-authz'
+    branch: 'master'
+    mvn-settings: 'aaf-authz-settings'
+
+- project:
+    name: aaf-authz-info
+    project-name: aaf-authz
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/authz
+    branch: master