X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fsimulators%2Fnf-simulator%2Fintegration-simulators-nf-simulator-netconf-server.yaml;h=8461e4da0507ad6f19e74d67bcc875c5b0e2b44d;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=a3345c8cc48d2c009d7e6724a61c9426fbb7974b;hpb=786430fd064efc8b11ad90e58929debb7cfb5e21;p=ci-management.git

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index a3345c8cc..8461e4da0 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -1,66 +1,55 @@
 ---
-
 - project:
-      name: integration-simulators-nf-simulator-netconf-server
-      project-name: 'integration-simulators-nf-simulator-netconf-server'
-      python-version: python3.8
-      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 install -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-8c-8g
-
-      project: 'integration/simulators/nf-simulator/netconf-server'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-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'
+    name: integration-simulators-nf-simulator-netconf-server
+    project-name: "integration-simulators-nf-simulator-netconf-server"
+    python-version: python3.8
+    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 install -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-- project:
-      name: integration-simulators-nf-simulator-netconf-server-sonar
-      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/netconf-server'
-      project-name: 'integration-simulators-nf-simulator-netconf-server'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "integration/simulators/nf-simulator/netconf-server"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-netconf-server-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-netconf-server-view
-      project-name: integration-simulators-nf-simulator-netconf-server
-      views:
-          - project-view
+    name: integration-simulators-nf-simulator-netconf-server-sonar
+    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/nf-simulator/netconf-server"
+    project-name: "integration-simulators-nf-simulator-netconf-server"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-netconf-server-info
-      project: integration/simulators/nf-simulator/netconf-server
-      project-name: integration-simulators-nf-simulator-netconf-server
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-netconf-server-view
+    project-name: integration-simulators-nf-simulator-netconf-server
+    views:
+      - project-view