X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-docker.yaml;h=8a4cf0d85d6ca5c878c5ff12ca2fc4d3bc60d0e9;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=cf6c430d228ffce38d9df848781b1f3079c23df7;hpb=e5bbbf353b1271a8e4ff8ff5dec972a293dec14b;p=ci-management.git

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index cf6c430d2..8a4cf0d85 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -3,13 +3,17 @@
     name: integration-docker
     project-name: 'integration'
     jobs:
-      - '{project-name}-{stream}-{subproject}-docker-merge'
-      - '{project-name}-{stream}-{subproject}-docker-verify'
+      - 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'
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
@@ -32,8 +36,14 @@
     docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
     docker-root: test/mocks/netconf-pnp-simulator/engine
     container-tag-method: yaml-file
-    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-    build-node: centos7-docker-8c-8g
+    post_docker_build_script: |
+        #!/bin/bash
+        set -eux
+        cd "$DOCKER_ROOT"
+        # To simplify the references inside tox.ini and tests/settings.py
+        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+        tox
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify