Merge "Fix AAI-Simulator job by removing copy-paste code"

[ci-management.git] / jjb / integration / integration-docker.yaml

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index aeb50e9..7858ace 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -10,6 +10,10 @@
       - '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/**'
@@ -17,17 +21,11 @@
           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 --count {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 --count {PNF_INSTANCES}
-              ./mass-pnf-sim.py trigger --count {PNF_INSTANCES}
-              ./mass-pnf-sim.py status --count {PNF_INSTANCES}
-              ./mass-pnf-sim.py stop --count {PNF_INSTANCES}
-              ./mass-pnf-sim.py clean
+              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''