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

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index c39ca2aba..8a4cf0d85 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -10,23 +10,13 @@
       - '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/**'
-      - 'mass-pnf-sim':
-          pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
-          pattern: 'test/mocks/mass-pnf-sim/**'
-          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          PNF_INSTANCES: 1
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/test/mocks/mass-pnf-sim
-              ./mass-pnf-sim.py --bootstrap {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16
-              ./mass-pnf-sim.py --start {PNF_INSTANCES}
-              ./mass-pnf-sim.py --trigger {PNF_INSTANCES}
-              ./mass-pnf-sim.py --stop {PNF_INSTANCES}
-              ./mass-pnf-sim.py --clean
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
@@ -53,7 +43,7 @@
         # 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: centos7-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify