summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-09-01 16:25:13 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-01 16:25:13 +0000
commit8d87b008a18ca01a026bdee8dc45e7b7f0446ae0 (patch)
treec9ed9ba936222adaad3b158ce7c1b6a4e3473367 /jjb
parent6cd17430128afd9fc957d68fe673d7cac6120e95 (diff)
parent3945ffacbedbda418990d1b6246e7c324f232b3f (diff)
Merge "Fix AAI-Simulator job by removing copy-paste code"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/integration/integration-docker.yaml28
1 files changed, 4 insertions, 24 deletions
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 410a02503..7858acefd 100644
--- 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/**'
@@ -53,27 +57,3 @@
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
-
-- project:
- name: integration-docker-aai-simulator
- project-name: 'integration'
- jobs:
- - 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'
- post-docker-verify-script: |
- #!/bin/bash
- set -ex # Fail build if any setup step fails
- cd $WORKSPACE/test/mocks/aai-simulator
- tox
- mvn-settings: 'integration-settings'
- files: '**'
- archive-artifacts: ''