From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Tue, 1 Sep 2020 11:15:06 +0000 (+0200)
Subject: Fix AAI-Simulator job by removing copy-paste code
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3945ffacbedbda418990d1b6246e7c324f232b3f;p=ci-management.git

Fix AAI-Simulator job by removing copy-paste code

Change-Id: I9380405e21486f11da15c899c8213ec2195c1456
Issue-ID: INT-1704
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 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: ''