Refactor: Cleanup for pre-commit

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

diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml
index 274e4f4..5b87d5a 100644 (file)
--- a/jjb/multicloud/multicloud-csit.yaml
+++ b/jjb/multicloud/multicloud-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: multicloud-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud'
-    recipients: 'bin.yang@windriver.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "multicloud"
+    recipients: "bin.yang@windriver.com"
+    stream: "master"
     functionality:
-      - 'functionality1':
+      - "functionality1":
           trigger_jobs:
-    robot-options: ''
-    branch: 'master'
+    robot-options: ""
+    branch: "master"

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 068ff12..eb665e7 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -1,20 +1,20 @@
 ---
 - project:
     name: multicloud-framework-java
-    project-name: 'multicloud-framework'
-    project: 'multicloud/framework'
+    project-name: "multicloud-framework"
+    project: "multicloud/framework"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-    mvn-settings: 'multicloud-framework-settings'
+    mvn-settings: "multicloud-framework-settings"
     subproject:
-      - 'multivimbroker':
-          pom: 'multivimbroker/pom.xml'
-          pattern: 'multivimbroker/**'
-      - 'artifactbroker':
-          pom: 'artifactbroker/pom.xml'
-          pattern: 'artifactbroker/**'
+      - "multivimbroker":
+          pom: "multivimbroker/pom.xml"
+          pattern: "multivimbroker/**"
+      - "artifactbroker":
+          pom: "artifactbroker/pom.xml"
+          pattern: "artifactbroker/**"
     jobs:
       - gerrit-maven-stage:
           sbom-generator: true
@@ -25,102 +25,80 @@
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-goals: install
-          mvn-params: '-P docker'
+          mvn-params: "-P docker"
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - "{project-name}-{stream}-{subproject}-verify-java"
+      - "{project-name}-{stream}-{subproject}-merge-java"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: multicloud-framework-arm64-java
-#    project-name: 'multicloud-framework-arm64'
-#    project: 'multicloud/framework'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-framework-settings'
-#    subproject:
-#      - 'multivimbroker':
-#          pom: 'multivimbroker/pom.xml'
-#          pattern: 'multivimbroker/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
     name: multicloud-framework-multivimbroker-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: 'multicloud/framework'
-    project-name: 'multicloud-framework-multivimbroker'
-    branch: 'master'
-    mvn-params: '-f multivimbroker/pom.xml'
-    mvn-settings: 'multicloud-framework-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/framework"
+    project-name: "multicloud-framework-multivimbroker"
+    branch: "master"
+    mvn-params: "-f multivimbroker/pom.xml"
+    mvn-settings: "multicloud-framework-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-framework-multivimbroker-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: multicloud/framework
-    project-name: 'multicloud-framework-multivimbroker'
+    project-name: "multicloud-framework-multivimbroker"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-params: '-f multivimbroker/pom.xml'
-    mvn-settings: 'multicloud-framework-settings'
+      - "master":
+          branch: "master"
+    mvn-params: "-f multivimbroker/pom.xml"
+    mvn-settings: "multicloud-framework-settings"
 
 - project:
     name: multicloud-framework-artifactbroker-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: 'multicloud/framework'
-    project-name: 'multicloud-framework-artifactbroker'
-    branch: 'master'
+    project: "multicloud/framework"
+    project-name: "multicloud-framework-artifactbroker"
+    branch: "master"
     java-version: openjdk11
-    mvn-params: '-f artifactbroker/pom.xml'
-    mvn-settings: 'multicloud-framework-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-params: "-f artifactbroker/pom.xml"
+    mvn-settings: "multicloud-framework-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-framework-artifactbroker-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: multicloud/framework
-    project-name: 'multicloud-framework-artifactbroker'
+    project-name: "multicloud-framework-artifactbroker"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-params: '-f artifactbroker/pom.xml'
-    mvn-settings: 'multicloud-framework-settings'
+    mvn-params: "-f artifactbroker/pom.xml"
+    mvn-settings: "multicloud-framework-settings"

diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index d81081a..412401d 100644 (file)
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
     name: multicloud-framework-python
-    project-name: 'multicloud-framework'
-    project: 'multicloud/framework'
+    project-name: "multicloud-framework"
+    project: "multicloud/framework"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-framework-settings'
-    build-node: 'ubuntu1804-builder-4c-4g'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-framework-settings"
+    build-node: "ubuntu1804-builder-4c-4g"
     subproject:
-      - 'multivimbroker':
-          path: 'multivimbroker'
-          pattern: 'multivimbroker/**'
+      - "multivimbroker":
+          path: "multivimbroker"
+          pattern: "multivimbroker/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"

diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml
index 9519ea6..9f39280 100644 (file)
--- a/jjb/multicloud/multicloud-info.yaml
+++ b/jjb/multicloud/multicloud-info.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: multicloud-info
     project-name: multicloud

diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 0e0a25d..c1ca0e6 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -1,56 +1,32 @@
 ---
 - project:
     name: multicloud-k8s
-    project-name: 'multicloud-k8s'
-    path: 'src'
-    golangver: 'golang114'
+    project-name: "multicloud-k8s"
+    path: "src"
+    golangver: "golang114"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-verify-golang'
-      - '{project-name}-{stream}-merge-golang'
-      - '{project-name}-{stream}-docker-golang-shell-daily':
-          script:
-            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
-      - '{project-name}-{stream}-{area}-verify-shell':
-          disable-job: '{disable-kud}'
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{project-name}-{stream}-verify-golang"
+      - "{project-name}-{stream}-merge-golang"
+      - "{project-name}-{stream}-docker-golang-shell-daily":
+          script: !include-raw-escape: "build-multicloud-k8s-docker-image.sh"
+      - "{project-name}-{stream}-{area}-verify-shell":
+          disable-job: "{disable-kud}"
           area: kud-deployment
           build-timeout: 45
-          script:
-            !include-raw-escape: 'kud-deployment.sh'
-      - '{project-name}-gerrit-release-jobs':
+          script: !include-raw-escape: "kud-deployment.sh"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'multicloud/k8s'
+    project: "multicloud/k8s"
     subproject:
       - validation-scripts:
-          path: '.'
-          pattern: '**'
+          path: "."
+          pattern: "**"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-k8s-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-k8s-settings"
     disable-kud: false
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-#    name: multicloud-k8s-arm64
-#    project-name: 'multicloud-k8s-arm64'
-#    path: 'src/k8splugin'
-#    golangver: 'golang114'
-#    jobs:
-#      - '{project-name}-{stream}-docker-golang-shell-daily':
-#          script:
-#            !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
-#    project: 'multicloud/k8s'
-#    subproject:
-#      - validation-scripts:
-#          path: '.'
-#          pattern: '**'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-k8s-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g

diff --git a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
index e0e4656..5c5c819 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml
@@ -2,14 +2,14 @@
 - project:
     name: multicloud-openstack-fcaps-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-fcaps'
-    recipients: 'bin.yang@windriver.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "multicloud-fcaps"
+    recipients: "bin.yang@windriver.com"
+    stream: "master"
     functionality:
-      - 'functionality1':
+      - "functionality1":
           trigger_jobs:
-    robot-options: ''
-    branch: 'master'
+    robot-options: ""
+    branch: "master"
     disabled: true

diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
deleted file mode 100644 (file)
index 92f21d2..0000000
--- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----\r
-#- project:\r
-#    name: multicloud-openstack-lenovo-csit\r
-#    jobs:\r
-#      - '{project-name}-{stream}-verify-csit-{functionality}'\r
-#      - '{project-name}-{stream}-csit-{functionality}'\r
-#    project-name: 'multicloud-lenovo'\r
-#    stream: 'master'\r
-#    functionality:\r
-#      - 'functionality1':\r
-#          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'\r
-#    robot-options: ''\r
-#    branch: 'master'\r

diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
index 353b18f..93b9715 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: multicloud-openstack-starlingx-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-starlingx'
-    recipients: 'bin.yang@windriver.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "multicloud-starlingx"
+    recipients: "bin.yang@windriver.com"
+    stream: "master"
     functionality:
-      - 'functionality1':
+      - "functionality1":
           trigger_jobs:
-    robot-options: ''
-    branch: 'master'
+    robot-options: ""
+    branch: "master"

diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
index f854f63..f23f68e 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
@@ -2,14 +2,14 @@
 - project:
     name: multicloud-openstack-vmware-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-vmware'
-    recipients: 'bin.yang@windriver.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "multicloud-vmware"
+    recipients: "bin.yang@windriver.com"
+    stream: "master"
     functionality:
-      - 'functionality1':
+      - "functionality1":
           trigger_jobs:
-    robot-options: ''
-    branch: 'master'
+    robot-options: ""
+    branch: "master"
     disabled: true

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 99321a2..eba77f4 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
     name: multicloud-openstack-vmware-java
-    project-name: 'multicloud-openstack-vmware'
-    project: 'multicloud/openstack/vmware'
+    project-name: "multicloud-openstack-vmware"
+    project: "multicloud/openstack/vmware"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
     subproject:
-      - 'vio':
-          pom: 'vio/pom.xml'
-          pattern: 'vio/**'
+      - "vio":
+          pom: "vio/pom.xml"
+          pattern: "vio/**"
     jobs:
       - gerrit-maven-stage:
           sbom-generator: true
@@ -21,73 +21,51 @@
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-goals: install
-          mvn-params: '-P docker'
+          mvn-params: "-P docker"
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - "{project-name}-{stream}-{subproject}-verify-java"
+      - "{project-name}-{stream}-{subproject}-merge-java"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
     disabled: true
 
-#- project:
-#    name: multicloud-openstack-vmware-arm64-java
-#    project-name: 'multicloud-openstack-vmware-arm64'
-#    project: 'multicloud/openstack/vmware'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-vmware-settings'
-#    subproject:
-#      - 'vio':
-#          pom: 'vio/pom.xml'
-#          pattern: 'vio/**'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-#          build-node: ubuntu1804-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
-#
 - project:
     name: multicloud-openstack-vmware-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: 'multicloud/openstack/vmware'
-    project-name: 'multicloud-openstack-vmware'
-    branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack/vmware"
+    project-name: "multicloud-openstack-vmware"
+    branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     disabled: true
 
 - project:
     name: multicloud-openstack-vmware-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: multicloud/openstack/vmware
-    project-name: 'multicloud-openstack-vmware'
-    build-node: 'ubuntu1804-builder-4c-4g'
+    project-name: "multicloud-openstack-vmware"
+    build-node: "ubuntu1804-builder-4c-4g"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
     disabled: true
 
 - project:

diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
index 45cccb1..fbc198e 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
     name: multicloud-openstack-vmware-python
-    project-name: 'multicloud-openstack-vmware'
-    project: 'multicloud/openstack/vmware'
+    project-name: "multicloud-openstack-vmware"
+    project: "multicloud/openstack/vmware"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu1804-builder-4c-4g'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-vmware-settings"
+    build-node: "ubuntu1804-builder-4c-4g"
     subproject:
-      - 'vio':
-          path: 'vio'
-          pattern: 'vio/**'
+      - "vio":
+          path: "vio"
+          pattern: "vio/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
     disabled: true

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index ed4a7d2..7b4bdd6 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -7,215 +7,144 @@
 
 - project:
     name: multicloud-openstack
-    project-name: 'multicloud-openstack'
-    project: 'multicloud/openstack'
+    project-name: "multicloud-openstack"
+    project: "multicloud/openstack"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-settings"
     subproject:
-      - 'pike':
-          path: 'pike'
-          pattern: 'pike/**'
-          pom: 'pike/pom.xml'
-      - 'pike_share':
-          path: 'pike'
-          pattern: 'share/**'
-          pom: 'pike/pom.xml'
-      - 'starlingx':
-          path: 'starlingx'
-          pattern: 'starlingx/**'
-          pom: 'starlingx/pom.xml'
-      - 'starlingx_share':
-          path: 'starlingx'
-          pattern: 'share/**'
-          pom: 'starlingx/pom.xml'
-      - 'windriver':
-          path: 'windriver'
-          pattern: 'windriver/**'
-          pom: 'windriver/pom.xml'
-      - 'windriver_share':
-          path: 'windriver'
-          pattern: 'share/**'
-          pom: 'windriver/pom.xml'
-      - 'fcaps':
-          path: 'fcaps'
-          pattern: 'fcaps/**'
-          pom: 'fcaps/pom.xml'
-#      - 'lenovo':
-#          path: 'lenovo'
-#          pattern: 'lenovo/**'
-#          pom: 'lenovo/pom.xml'
-#      - 'lenovo_share':
-#          path: 'lenovo'
-#          pattern: 'share/**'
-#          pom: 'lenovo/pom.xml'
-      - 'hpa':
-          path: 'hpa'
-          pattern: 'hpa/**'
-          pom: 'hpa/pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          sbom-generator: true
-          maven-goals: install
-          mvn-params: '-P docker'
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'centos8-builder-4c-4g'
-
-#- project:
-#    name: multicloud-openstack-arm64
-#    project-name: 'multicloud-openstack-arm64'
-#    project: 'multicloud/openstack'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'multicloud-openstack-settings'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1804-docker-arm64-4c-2g
-#    files: '**'
-#    archive-artifacts: ''
-#
+      - "pike":
+          path: "pike"
+          pattern: "pike/**"
+          pom: "pike/pom.xml"
+      - "pike_share":
+          path: "pike"
+          pattern: "share/**"
+          pom: "pike/pom.xml"
+      - "starlingx":
+          path: "starlingx"
+          pattern: "starlingx/**"
+          pom: "starlingx/pom.xml"
+      - "starlingx_share":
+          path: "starlingx"
+          pattern: "share/**"
+          pom: "starlingx/pom.xml"
+      - "windriver":
+          path: "windriver"
+          pattern: "windriver/**"
+          pom: "windriver/pom.xml"
+      - "windriver_share":
+          path: "windriver"
+          pattern: "share/**"
+          pom: "windriver/pom.xml"
+      - "fcaps":
+          path: "fcaps"
+          pattern: "fcaps/**"
+          pom: "fcaps/pom.xml"
 
 - project:
     name: multicloud-openstack-windriver-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: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-windriver'
-    branch: 'master'
-    mvn-params: '-f windriver/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack"
+    project-name: "multicloud-openstack-windriver"
+    branch: "master"
+    mvn-params: "-f windriver/pom.xml"
+    mvn-settings: "multicloud-openstack-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-openstack-pike-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: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-pike'
-    branch: 'master'
-    mvn-params: '-f pike/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack"
+    project-name: "multicloud-openstack-pike"
+    branch: "master"
+    mvn-params: "-f pike/pom.xml"
+    mvn-settings: "multicloud-openstack-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-openstack-starlingx-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: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-starlingx'
-    branch: 'master'
-    mvn-params: '-f starlingx/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack"
+    project-name: "multicloud-openstack-starlingx"
+    branch: "master"
+    mvn-params: "-f starlingx/pom.xml"
+    mvn-settings: "multicloud-openstack-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-openstack-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: multicloud/openstack
-    project-name: 'multicloud-openstack'
+    project-name: "multicloud-openstack"
     build-node: ubuntu2004-memcached-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'multicloud-openstack-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "multicloud-openstack-settings"
 
 - project:
     name: multicloud-openstack-fcaps-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: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-fcaps'
-    branch: 'master'
-    mvn-params: '-f fcaps/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-#- project:
-#    name: multicloud-openstack-lenovo-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'
-#    build-node: ubuntu1804-builder-4c-4g
-#    project: 'multicloud/openstack'
-#    project-name: 'multicloud-openstack-lenovo'
-#    branch: 'master'
-#    mvn-params: '-f lenovo/pom.xml'
-#    mvn-settings: 'multicloud-openstack-settings'
-#    mvn-goals: 'clean install'
-#    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack"
+    project-name: "multicloud-openstack-fcaps"
+    branch: "master"
+    mvn-params: "-f fcaps/pom.xml"
+    mvn-settings: "multicloud-openstack-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-openstack-hpa-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: 'multicloud/openstack'
-    project-name: 'multicloud-openstack-hpa'
-    branch: 'master'
-    mvn-params: '-f hpa/pom.xml'
-    mvn-settings: 'multicloud-openstack-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "multicloud/openstack"
+    project-name: "multicloud-openstack-hpa"
+    branch: "master"
+    mvn-params: "-f hpa/pom.xml"
+    mvn-settings: "multicloud-openstack-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: multicloud-openstack-info