Chore: Move to ubuntu2004-docker

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

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index c39ca2a..59b4f28 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -10,23 +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'
-          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: ''
@@ -53,7 +43,7 @@
         # 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: ubuntu2004-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify