Move masspnf-simulator job to it's own place

Change-Id: If1752019adbf8d428df08ca830569f14d7f1fc84
Issue-ID: INT-1810
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index e0b655d..da2b798 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -17,15 +17,6 @@
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'masspnfsim':
-          pom: 'test/mocks/masspnfsim/pnf-sim-lightweight/pom.xml'
-          pattern: 'test/mocks/masspnfsim/**'
-          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/test/mocks/masspnfsim
-              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml
index d931199..93571a8 100644 (file)
--- a/jjb/integration/simulators/integration-masspnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-masspnf-simulator.yaml
@@ -12,3 +12,27 @@
     build-node: centos7-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-masspnf-simulator-docker
+    project-name: integration-simulators-masspnf-simulator
+    jobs:
+      - integration-docker-merge
+      - integration-docker-verify
+    project: integration/simulators/masspnf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'masspnfsim':
+          pom: 'pnf-sim-lightweight/pom.xml'
+          pattern: '**'
+          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/
+              tox -e pytest
+    mvn-settings: 'integration-settings'
+    files: '**'
+    archive-artifacts: ''