Merge "Update Mass PNF simulator path"

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

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 3062b00..e0b655d 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -3,22 +3,29 @@
     name: integration-docker
     project-name: 'integration'
     jobs:
-      - '{project-name}-{stream}-{subproject}-docker-merge'
-      - '{project-name}-{stream}-{subproject}-docker-verify'
+      - 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'
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'pnfsimulator':
-          pom: 'test/mocks/pnfsimulator/pnfsimulator/pom.xml'
-          pattern: 'test/mocks/pnfsimulator/pnfsimulator/**'
-      - 'netconfsimulator':
-          pom: 'test/mocks/pnfsimulator/netconfsimulator/pom.xml'
-          pattern: 'test/mocks/pnfsimulator/netconfsimulator/**'
+      - '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: ''
@@ -38,7 +45,13 @@
     docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
     docker-root: test/mocks/netconf-pnp-simulator/engine
     container-tag-method: yaml-file
-    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+    post_docker_build_script: |
+        #!/bin/bash
+        set -eux
+        cd "$DOCKER_ROOT"
+        # To simplify the references inside tox.ini and tests/settings.py
+        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+        tox
     build-node: centos7-docker-8c-8g
     build-timeout: 20
     jobs: