Refactor: Cleanup for pre-commit

Change-Id: Ic4626da2242f1944aacb174ee96c48b82298cdb5
Issue-ID: CIMAN-33
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 42774f9..2fa6b72 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -7,102 +7,85 @@
 
 - project:
     name: ccsdk-apps
-    project-name: 'ccsdk-apps'
+    project-name: "ccsdk-apps"
     jobs:
       - gerrit-maven-verify:
-          mvn-params: '-Ddocker.skip.push=true -Pdocker'
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
 
       - gerrit-maven-docker-stage:
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Pdocker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/apps'
+    project: "ccsdk/apps"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-apps-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-apps-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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-apps-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}'
-    cron: '@daily'
+    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-builder-4c-4g
-    project: 'ccsdk/apps'
-    project-name: 'ccsdk-apps'
-    branch: 'master'
+    project: "ccsdk/apps"
+    project-name: "ccsdk-apps"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-apps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-apps-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: ccsdk-apps-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/apps'
-    project-name: 'ccsdk-apps'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/apps"
+    project-name: "ccsdk-apps"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-apps-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-apps-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: ccsdk-apps-arm64-docker
-#    project-name: 'ccsdk-apps-arm64'
-#    jobs:
-#      - 'docker-version-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'ccsdk/apps'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'ccsdk-apps-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-
 - project:
     name: ccsdk-apps-info
     project-name: ccsdk-apps

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 11c5374..fb49d92 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -2,45 +2,45 @@
 - project:
     name: ccsdk-distribution-csit
     jobs:
-      - '{project-name}-review-verification-maven-{stream}':
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
           maven-versions-plugin: true
-      - '{project-name}-merge-verification-maven-{stream}':
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
           maven-versions-plugin: true
-    project-name: 'ccsdk-distribution'
-    recipients: 'dtimoney@att.com'
+    project-name: "ccsdk-distribution"
+    recipients: "dtimoney@att.com"
     # project name in gerrit
-    project: 'ccsdk/distribution'
+    project: "ccsdk/distribution"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'ccsdk-distribution-settings'
-    mvn-version: 'mvn38'
-    robot-options: ''
-    branch: 'master'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "ccsdk-distribution-settings"
+    mvn-version: "mvn38"
+    robot-options: ""
+    branch: "master"
 
 - project:
     name: ccsdk-oran-csit
     jobs:
-      - '{project-name}-review-verification-maven-{stream}':
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
-      - '{project-name}-merge-verification-maven-{stream}':
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker'
-    project-name: 'ccsdk-oran'
-    recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+    project-name: "ccsdk-oran"
+    recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech"
     # project name in gerrit
-    project: 'ccsdk/oran'
+    project: "ccsdk/oran"
     stream:
-      - 'master':
+      - "master":
           java-version: openjdk17
-          branch: 'master'
-      - 'kohn':
+          branch: "master"
+      - "kohn":
           java-version: openjdk11
-          branch: 'kohn'
-    mvn-settings: 'ccsdk-oran-settings'
-    mvn-version: 'mvn38'
-    robot-options: ''
-    branch: 'master'
+          branch: "kohn"
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-version: "mvn38"
+    robot-options: ""
+    branch: "master"

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 8927add..b30eea6 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,61 +1,61 @@
 ---
 - project:
     name: ccsdk-oran
-    project-name: 'ccsdk-oran'
+    project-name: "ccsdk-oran"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          mvn-opts: '-Ddocker.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          mvn-opts: "-Ddocker.skip=true"
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Pdocker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'ccsdk/oran'
+    project: "ccsdk/oran"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-oran-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/oran'
-    project-name: 'ccsdk-oran'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/oran"
+    project-name: "ccsdk-oran"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-settings'
-    mvn-opts: '-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project:
@@ -71,21 +71,20 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'a1-policy-management/.*'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+        pattern: "a1-policy-management/.*"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-docker-8c-8g
-    project: 'ccsdk/oran'
-    project-name: 'ccsdk-oran'
-    branch: 'master'
+    project: "ccsdk/oran"
+    project-name: "ccsdk-oran"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f a1-policy-management'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -Ddocker.skip=true"
+    mvn-params: "-f a1-policy-management"

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 4232dfa..22c5606 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,121 +1,82 @@
 ---
 - project:
     name: ccsdk-cds-java17
-    project-name: 'ccsdk-cds'
+    project-name: "ccsdk-cds"
     jobs:
       - gerrit-maven-verify:
-          mvn-params: '-Ddocker.skip.push=true -Pdocker'
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Pdocker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/cds'
+    project: "ccsdk/cds"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-#- project:
-#    name: ccsdk-cds-java8
-#    project-name: 'ccsdk-cds'
-#    jobs:
-#      - gerrit-maven-verify:
-#          mvn-params: '-Ddocker.skip.push=true -P docker'
-#      - gerrit-maven-merge:
-#          cron: '@daily'
-#          mvn-params: '-Ddocker.skip.push=true -P docker'
-#      - gerrit-maven-stage:
-#          build-node: centos8-builder-4c-4g
-#          sign-artifacts: true
-#          mvn-params: '-Dmaven.test.skip=true'
-#          cron: ''
-#      - gerrit-maven-docker-stage:
-#          container-public-registry: 'nexus3.onap.org:10001'
-#          container-staging-registry: 'nexus3.onap.org:10003'
-#          mvn-params: '-Dmaven.test.skip=true -P docker'
-#          maven-versions-plugin: true
-#          cron: '@daily'
-
-#    project: 'ccsdk/cds'
-#    stream:
-#      - 'frankfurt':
-#          branch: 'frankfurt'
-#    java-version: openjdk8
-#    mvn-version: 'mvn38'
-#    mvn-settings: 'ccsdk-cds-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: centos7-docker-2c-1g
-#    mvn-snapshot-id: 'ecomp-snapshots'
-#    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-cds-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}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-builder-4c-4g
-    project: 'ccsdk/cds'
-    project-name: 'ccsdk-cds'
-    branch: 'master'
+    project: "ccsdk/cds"
+    project-name: "ccsdk-cds"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: ccsdk-cds-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/cds'
-    project-name: 'ccsdk-cds'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/cds"
+    project-name: "ccsdk-cds"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project:

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index de07281..95988b1 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,83 +1,64 @@
 ---
 - project:
     name: ccsdk-distribution
-    project-name: 'ccsdk-distribution'
+    project-name: "ccsdk-distribution"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
           maven-versions-plugin: true
-          cron: ''
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos8-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/distribution'
+    project: "ccsdk/distribution"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-distribution-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
-
-#- project:
-#    name: ccsdk-distribution-arm64-docker
-#    project-name: 'ccsdk-distribution-arm64'
-#    jobs:
-#      - 'docker-version-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'ccsdk/distribution'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'ccsdk-distribution-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: centos8-docker-arm64-4c-2g
-#
 - project:
     name: ccsdk-distribution-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/distribution'
-    project-name: 'ccsdk-distribution'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/distribution"
+    project-name: "ccsdk-distribution"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-distribution-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-distribution-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-docker-8c-8g
 
-
 - project:
     name: ccsdk-distribution-info
     project-name: ccsdk-distribution

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 20f24b9..fb89034 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,78 +1,78 @@
 ---
 - project:
     name: ccsdk-features
-    project-name: 'ccsdk-features'
+    project-name: "ccsdk-features"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/features'
+    project: "ccsdk/features"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-          mvn-opts: '-Xmx3072m'
-      - 'kohn':
-          branch: 'kohn'
+          mvn-opts: "-Xmx3072m"
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-          mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-features-settings'
+          mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-features-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}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-builder-4c-4g
-    project: 'ccsdk/features'
-    project-name: 'ccsdk-features'
-    branch: 'master'
+    project: "ccsdk/features"
+    project-name: "ccsdk-features"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-features-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx3072m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx3072m"
 
 - project:
     name: ccsdk-features-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/features'
-    project-name: 'ccsdk-features'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/features"
+    project-name: "ccsdk-features"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-features-settings'
-    mvn-opts: '-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-settings"
+    mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project:

diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index ea8331b..538c5ba 100644 (file)
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -7,76 +7,75 @@
 
 - project:
     name: ccsdk-odl-legacy
-    project-name: 'ccsdk-odl-legacy'
+    project-name: "ccsdk-odl-legacy"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos8-docker-8c-8g
 
-    project: 'ccsdk/odl-legacy'
+    project: "ccsdk/odl-legacy"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-odl-legacy-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-odl-legacy-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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-odl-legacy-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}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-builder-4c-4g
-    project: 'ccsdk/odl-legacy'
-    project-name: 'ccsdk-odl-legacy'
-    branch: 'master'
+    project: "ccsdk/odl-legacy"
+    project-name: "ccsdk-odl-legacy"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-odl-legacy-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-odl-legacy-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: ccsdk-odl-legacy-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/odl-legacy'
-    project-name: 'ccsdk-odl-legacy'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/odl-legacy"
+    project-name: "ccsdk-odl-legacy"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-odl-legacy-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-odl-legacy-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
-
 - project:
     name: ccsdk-odl-legacy-info
     project: ccsdk/odl-legacy

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 9f430e7..1790aef 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,65 +1,65 @@
 ---
 - project:
     name: ccsdk-parent
-    project-name: 'ccsdk-parent'
+    project-name: "ccsdk-parent"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    project: 'ccsdk/parent'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    project: "ccsdk/parent"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
           jobs:
             - gerrit-maven-verify:
-                mvn-params: '-Drevision=3.0.0-SNAPSHOT'
+                mvn-params: "-Drevision=3.0.0-SNAPSHOT"
             - gerrit-maven-merge:
-                mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0-SNAPSHOT'
+                mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0-SNAPSHOT"
             - gerrit-maven-stage:
-                mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
-            - '{project-name}-gerrit-release-jobs':
-                mvn-params: '-Drevision=3.0.0'
-      - 'kohn':
-          branch: 'kohn'
+                mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0"
+            - "{project-name}-gerrit-release-jobs":
+                mvn-params: "-Drevision=3.0.0"
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-parent-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-parent-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: ''
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     name: ccsdk-parent-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/parent'
-    project-name: 'ccsdk-parent'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/parent"
+    project-name: "ccsdk-parent"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-parent-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-parent-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project:

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index d755bac..a0b2bcf 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,76 +1,76 @@
 ---
 - project:
     name: ccsdk-sli
-    project-name: 'ccsdk-sli'
+    project-name: "ccsdk-sli"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/sli'
+    project: "ccsdk/sli"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk17
-      - 'kohn':
-          branch: 'kohn'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-sli-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-sli-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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: ccsdk-sli-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}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-builder-4c-4g
-    project: 'ccsdk/sli'
-    project-name: 'ccsdk-sli'
-    branch: 'master'
+    project: "ccsdk/sli"
+    project-name: "ccsdk-sli"
+    branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-sli-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-sli-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: ccsdk-sli-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli'
-    project-name: 'ccsdk-sli'
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/sli"
+    project-name: "ccsdk-sli"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk17
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-sli-settings'
-    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-sli-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-builder-4c-4g
 
 - project: