Merge "Prep for mod2 seedcode (poc) delivery"

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index b315bc4..410a025 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -53,3 +53,27 @@
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
+
+- project:
+    name: integration-docker-aai-simulator
+    project-name: 'integration'
+    jobs:
+      - integration-docker-merge
+      - integration-docker-verify
+    project: 'integration'
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'aai-simulator':
+          pom: 'test/mocks/aai-simulator/pom.xml'
+          pattern: 'test/mocks/aai-simulator/**'
+          mvn-goals: 'mvn clean install -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/test/mocks/aai-simulator
+              tox
+    mvn-settings: 'integration-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 33d89f9..a3a0d60 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -12,4 +12,7 @@
           - "certservice":
                 trigger_jobs:
                     - "oom-platform-cert-service-{stream}-merge-java"
+          - "truststoremerger":
+                trigger_jobs:
+                    - "oom-platform-cert-service-{stream}-merge-java"
       robot-options: ""