X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fsimulators%2Fintegration-pnf-simulator.yaml;h=41ca03bf86afe4caa7c0a7fe46fd6660df54f3f4;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=4d6fe876a6bc2ddd8297e482dfb777bcbcd6ae63;hpb=92686df49311af047aeea73b68d5d3a1c35aece0;p=ci-management.git

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 4d6fe876a..41ca03bf8 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,105 +1,93 @@
 ---
 - project:
-      name: integration-simulators-pnf-simulator
-      project-name: integration-pnf-simulator
-      stream:
-          -   'master':
-                  branch: 'master'
-                  java-version: openjdk11
-      project: 'integration/simulators/pnf-simulator'
-      mvn-settings: 'integration-simulators-pnf-simulator-settings'
-      files: '**'
-      maven-deploy-properties: |
-          deployAtEnd=true
-      archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
-      jobs:
-          - '{project-name}-{stream}-verify-java':
-                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':
-                 build-node: centos7-docker-8c-8g
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-goals: 'clean deploy'
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+    name: integration-simulators-pnf-simulator
+    project-name: integration-pnf-simulator
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    project: "integration/simulators/pnf-simulator"
+    mvn-settings: "integration-simulators-pnf-simulator-settings"
+    files: "**"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java":
+          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":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy"
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
 
 - project:
-      name: integration-simulators-pnf-simulator-sonar
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-sonar
-      sonarcloud: true
-      sonarcloud-project-organization: '{sonarcloud_project_organization}'
-      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-      sonar-mvn-goal: '{sonar_mvn_goal}'
-      cron: '@daily'
-      build-node: ubuntu1804-docker-8c-8g
-      project: integration/simulators/pnf-simulator
-      project-name: integration-pnf-simulator
-      branch: 'master'
-      mvn-settings: 'integration-simulators-pnf-simulator-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-      name: integration-simulators-pnf-simulator-info
-      project-name: integration-pnf-simulator
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: integration/simulators/pnf-simulator
-      branch: master
+    name: integration-simulators-pnf-simulator-sonar
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-docker-8c-8g
+    project: integration/simulators/pnf-simulator
+    project-name: integration-pnf-simulator
+    branch: "master"
+    mvn-settings: "integration-simulators-pnf-simulator-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - 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'
+    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-pnf-simulator
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'python':
-                tox-dir: '.'
-                tox-envs: 'py'
-                pattern: '**/*.py'
-      stream:
-          - 'master':
-                branch: 'master'
-
+    name: integration-simulators-pnf-simulator-linters
+    project: integration/simulators/pnf-simulator
+    project-name: integration-pnf-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+    stream:
+      - "master":
+          branch: "master"