X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-restconf.yaml;h=77b705ff75623549cb49527d87dfd2b58f06f104;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=54e9b3f81d90c733c46e111acc4e128c8343fb0e;hpb=f96c57cf2ef9c09772b2a863124b16b80a00b75f;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 54e9b3f81..77b705ff7 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: dcaegen2-collectors-restconf
-    project-name: 'dcaegen2-collectors-restconf'
+    project-name: "dcaegen2-collectors-restconf"
     java-version: openjdk11
     jobs:
       - gerrit-maven-verify:
@@ -10,32 +10,32 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           sbom-generator: true
-          build-node: centos7-docker-8c-8g
+          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 package docker:build -DpushImageTag'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dcaegen2/collectors/restconf'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean package docker:build -DpushImageTag"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dcaegen2/collectors/restconf"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    mvn-settings: "dcaegen2-collectors-restconf-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'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
@@ -43,39 +43,27 @@
     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'
+    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: 'dcaegen2/collectors/restconf'
-    project-name: 'dcaegen2-collectors-restconf'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/collectors/restconf"
+    project-name: "dcaegen2-collectors-restconf"
+    branch: "master"
+    mvn-settings: "dcaegen2-collectors-restconf-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-collectors-restconf-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/collectors/restconf
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-collectors-restconf'
+    project-name: "dcaegen2-collectors-restconf"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-restconf-settings'
-
-- project:
-    name: dcaegen2-collectors-restconf-info
-    project-name: dcaegen2-collectors-restconf
-    java-version: openjdk11
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dcaegen2/collectors/restconf
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-collectors-restconf-settings"