3 files changed, 77 insertions, 5 deletions
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index f1e9570da..29d4cd3ea 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -16,7 +16,7 @@
     archive-artifacts: ''
 
 - project:
-    name: aaf-cadi-sonar
+    name: aaf-cadi-shiro-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
@@ -24,6 +24,80 @@
     project: 'aaf/cadi'
     project-name: 'aaf-cadi'
     branch: 'master'
+    mvn-params: '-f shiro/pom.xml'
     mvn-settings: 'aaf-cadi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+# Though the below docker jobs have "aai" in the name, there is no aai code involved.
+- project:
+    name: aaf-cadi-fproxy
+    project-name: 'aaf-cadi-fproxy'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/fproxy/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-fproxy-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi-fproxy'
+    branch: 'master'
+    mvn-params: '-f sidecar/fproxy/pom.xml'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-cadi-rproxy
+    project-name: 'aaf-cadi-rproxy'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/rproxy/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-rproxy-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi-rproxy'
+    branch: 'master'
+    mvn-params: '-f sidecar/rproxy/pom.xml'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-cadi-tproxy-config
+    project-name: 'aaf-cadi-tproxy-config'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/tproxy-config/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml
index aec49b368..42aefcf38 100644
--- a/jjb/aaf/aaf-csit.yaml
+++ b/jjb/aaf/aaf-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'aafapi':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml
index 474ca8b60..4e7f3ab08 100644
--- a/jjb/aaf/aaf-sms-csit.yaml
+++ b/jjb/aaf/aaf-sms-csit.yaml
@@ -8,7 +8,6 @@
       stream: 'master'
       functionality:
         - 'sms-test-plan':
-            trigger_jobs:
-              - 'aaf-sms-master-docker-golang-shell-daily'
+            trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily'
       robot-options: ''
       branch: 'master'