Merge "Enable jjb-verify check of build node labels"

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

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 2730cbb..c39ca2a 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -3,19 +3,58 @@
     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'
-      - 'amsterdam':
-          branch: 'amsterdam'
     subproject:
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
+      - 'mass-pnf-sim':
+          pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml'
+          pattern: 'test/mocks/mass-pnf-sim/**'
+          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+          PNF_INSTANCES: 1
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/test/mocks/mass-pnf-sim
+              ./mass-pnf-sim.py --bootstrap {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16
+              ./mass-pnf-sim.py --start {PNF_INSTANCES}
+              ./mass-pnf-sim.py --trigger {PNF_INSTANCES}
+              ./mass-pnf-sim.py --stop {PNF_INSTANCES}
+              ./mass-pnf-sim.py --clean
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+
+- project:
+    name: integration-netconf-pnp-simulator
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+    # Required by verifier
+    mvn-settings: 'integration-settings'
+    project-name: 'integration-netconf-pnp-simulator'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+    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: |
+        #!/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:
+      - gerrit-docker-verify
+      - gerrit-docker-merge