Chore: Revert back to ubuntu1804-docker

[ci-management.git] / jjb / integration / simulators / integration-pnf-simulator.yaml

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 09875f8..feae0d4 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
       name: integration-simulators-pnf-simulator
-      project-name: 'integration-simulators-pnf-simulator'
+      project-name: integration-pnf-simulator
       stream:
           -   'master':
                   branch: 'master'
-                  java-version: openjdk8
+                  java-version: openjdk11
       project: 'integration/simulators/pnf-simulator'
       mvn-settings: 'integration-simulators-pnf-simulator-settings'
       files: '**'
@@ -15,7 +15,7 @@
       build-node: ubuntu1804-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
+                mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
           - '{project-name}-{stream}-merge-java':
                 mvn-goals: 'clean deploy'
           -  '{project-name}-gerrit-release-jobs':
@@ -29,11 +29,11 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+                mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
 
 - project:
       name: integration-simulators-pnf-simulator-sonar
-      java-version: openjdk8
+      java-version: openjdk11
       jobs:
           - gerrit-maven-sonar
       sonarcloud: true
@@ -43,8 +43,8 @@
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
       build-node: ubuntu1804-docker-8c-8g
-      project: 'integration/simulators/pnf-simulator'
-      project-name: 'integration-simulators-pnf-simulator'
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
       branch: 'master'
       mvn-settings: 'integration-simulators-pnf-simulator-settings'
       mvn-goals: 'clean install'
@@ -53,17 +53,33 @@
 
 - project:
       name: integration-simulators-pnf-simulator-info
-      project-name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
       jobs:
           - gerrit-info-yaml-verify
-      build-node: centos7-builder-2c-1g
+      build-node: centos8-builder-2c-1g
       project: integration/simulators/pnf-simulator
       branch: master
 
+- project:
+      name: integration-simulators-pnf-simulator-cli
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
+      python-version: python3
+      jobs:
+          - integration-tox-verify
+      subproject:
+          - 'simulator-cli':
+                tox-dir: 'simulator-cli'
+                tox-envs: 'pytest'
+                pattern: '**/*'
+      stream:
+          - 'master':
+                branch: 'master'
+
 - project:
       name: integration-simulators-pnf-simulator-linters
       project: integration/simulators/pnf-simulator
-      project-name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
       python-version: python3
       jobs:
           - integration-linters
@@ -80,6 +96,10 @@
                 tox-dir: '.'
                 tox-envs: 'json'
                 pattern: '**/*.json'
+          - 'python':
+                tox-dir: '.'
+                tox-envs: 'py'
+                pattern: '**/*.py'
       stream:
           - 'master':
                 branch: 'master'