X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fsimulators%2Fnf-simulator%2Fintegration-ves-client-nf-simulator.yaml;h=526d782ed0c92ba6fe3e6fa298437947b8a47f26;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=29945732892c64e2dddbf1703e24b79c62fe7a22;hpb=62930b346d4b714f9876431eb714c3392fed5caa;p=ci-management.git

diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 299457328..526d782ed 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -1,66 +1,57 @@
 ---
 - project:
-      name: integration-simulators-nf-simulator-ves-client
-      project-name: 'integration-simulators-nf-simulator-ves-client'
-      java-version: openjdk11
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos7-docker-8c-8g
-                maven-versions-plugin: true
-          - 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-goals: 'clean deploy -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-8c-8g
+    name: integration-simulators-nf-simulator-ves-client
+    project-name: "integration-simulators-nf-simulator-ves-client"
+    java-version: openjdk11
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - 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-goals: "clean deploy -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'integration/simulators/nf-simulator/ves-client'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "integration/simulators/nf-simulator/ves-client"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: integration-simulators-nf-simulator-ves-client-sonar
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-sonar
-      sonarcloud: true
-      sonarcloud-project-organization: '{sonarcloud_project_organization}'
-      sonarcloud-api-token: '{sonarcloud_api_token}'
-      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/nf-simulator/ves-client'
-      project-name: 'integration-simulators-nf-simulator-ves-client'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-ves-client-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/nf-simulator/ves-client"
+    project-name: "integration-simulators-nf-simulator-ves-client"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-ves-client-view
-      project-name: integration-simulators-nf-simulator-ves-client
-      views:
-          - project-view
-
-- project:
-      name: integration-simulators-nf-simulator-ves-client-info
-      project: integration/simulators/nf-simulator/ves-client
-      project-name: integration-simulators-nf-simulator-ves-client
-      build-node: centos7-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-ves-client-view
+    project-name: integration-simulators-nf-simulator-ves-client
+    views:
+      - project-view