summaryrefslogtreecommitdiffstats
path: root/jjb/integration
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/integration')
-rw-r--r--jjb/integration/integration-docker.yaml9
-rw-r--r--jjb/integration/simulators/integration-masspnf-simulator.yaml24
2 files changed, 24 insertions, 9 deletions
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index e0b655db3..da2b798d9 100644
--- 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 d9311993f..93571a8d2 100644
--- 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: ''