CI: Update builder to use robotframework with py3

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

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index b315bc4..189d26b 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -10,18 +10,13 @@
       - '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/**'
-      - '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'
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/test/mocks/mass-pnf-sim
-              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
@@ -48,8 +43,36 @@
         # 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-node: ubuntu1804-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
+
+- project:
+      name: integration-ran-nssmf-simulator
+      project: integration
+      stream:
+          - 'master':
+                branch: 'master'
+      # Required by verifier
+      mvn-settings: 'integration-settings'
+      project-name: 'integration-ran-nssmf-simulator'
+      gerrit_trigger_file_paths:
+          - compare-type: REG_EXP
+            pattern: 'test/mocks/ran-nssmf-simulator/.*'
+      docker-name: 'onap/ran-nssmf-simulator'
+      docker-root: test/mocks/ran-nssmf-simulator
+      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" ran-nssmf-simulator:latest
+          tox
+      build-node: ubuntu1804-docker-8c-8g
+      build-timeout: 20
+      jobs:
+          - gerrit-docker-verify
+          - gerrit-docker-merge