Merge "[OOM] add helm3 linting"

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
deleted file mode 100644 (file)
index bd553e1..0000000
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-- project:
-    name: ccsdk-sli-adaptors
-    project-name: 'ccsdk-sli-adaptors'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/sli/adaptors'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-adaptors-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-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-sli-adaptors-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-builder-4c-4g
-    project: 'ccsdk/sli/adaptors'
-    project-name: 'ccsdk-sli-adaptors'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-adaptors-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-sli-adaptors-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/adaptors'
-    project-name: 'ccsdk-sli-adaptors'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-adaptors-settings'
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: ccsdk-sli-adaptors-info
-    project-name: ccsdk-sli-adaptors
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/sli/adaptors
-    branch: master
-
-- project:
-    name: ccsdk-sli-adaptors-whitesource
-    build-node: ubuntu1804-builder-4c-4g
-    project-name: ccsdk-sli-adaptors
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-adaptors-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/sli/adaptors
-    branch: master

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
deleted file mode 100644 (file)
index 658a92c..0000000
--- a/jjb/ccsdk/sli-core.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-- project:
-    name: ccsdk-sli-core
-    project-name: 'ccsdk-sli-core'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/sli/core'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-core-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-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-sli-core-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-builder-4c-4g
-    project: 'ccsdk/sli/core'
-    project-name: 'ccsdk-sli-core'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-core-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-sli-core-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/core'
-    project-name: 'ccsdk-sli-core'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-core-settings'
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: ccsdk-sli-core-info
-    project-name: ccsdk-sli-core
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/sli/core
-    branch: master
-
-- project:
-    name: ccsdk-sli-core-whitesource
-    project-name: ccsdk-sli-core
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-core-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/sli/core
-    branch: master

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
deleted file mode 100644 (file)
index a66c774..0000000
--- a/jjb/ccsdk/sli-northbound.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-- project:
-    name: ccsdk-sli-northbound
-    project-name: 'ccsdk-sli-northbound'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    sign-artifacts: true
-    project: 'ccsdk/sli/northbound'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-northbound-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-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-sli-northbound-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-builder-4c-4g
-    project: 'ccsdk/sli/northbound'
-    project-name: 'ccsdk-sli-northbound'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-northbound-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-sli-northbound-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/northbound'
-    project-name: 'ccsdk-sli-northbound'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-northbound-settings'
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: ccsdk-sli-northbound-info
-    project-name: ccsdk-sli-northbound
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/sli/northbound
-    branch: master
-
-- project:
-    name: ccsdk-sli-northbound-whitesource
-    project-name: ccsdk-sli-northbound
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-northbound-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/sli/northbound
-    branch: master

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
deleted file mode 100644 (file)
index 4433bb3..0000000
--- a/jjb/ccsdk/sli-plugins.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-- project:
-    name: ccsdk-sli-plugins
-    project-name: 'ccsdk-sli-plugins'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/sli/plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-plugins-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-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-sli-plugins-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-builder-4c-4g
-    project: 'ccsdk/sli/plugins'
-    project-name: 'ccsdk-sli-plugins'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-plugins-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-sli-plugins-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/sli/plugins'
-    project-name: 'ccsdk-sli-plugins'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-plugins-settings'
-
-- project:
-    name: ccsdk-sli-plugins-info
-    project-name: ccsdk-sli-plugins
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/sli/plugins
-    branch: master
-
-- project:
-    name: ccsdk-sli-plugins-whitesource
-    project-name: ccsdk-sli-plugins
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-sli-plugins-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/sli/plugins
-    branch: master

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 5111d81..0b405db 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
@@ -61,6 +63,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'

diff --git a/jjb/policy-clamp/policy-clamp.yaml b/jjb/policy-clamp/policy-clamp.yaml
new file mode 100644 (file)
index 0000000..124d848
--- /dev/null
+++ b/jjb/policy-clamp/policy-clamp.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: policy-clamp-project-view
+    project-name: policy-clamp
+    views:
+      - project-view
+
+- project:
+    name: policy-clamp-info
+    project: policy/clamp
+    project-name: policy-clamp
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index c8ef466..e02d612 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -22,10 +22,13 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'guilin':
           branch: 'guilin'
+          java-version: openjdk8
       - 'frankfurt':
           branch: 'frankfurt'
+          java-version: openjdk8
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index cb70a08..c72f904 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -27,8 +27,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'testsuite-settings'
 
 - project:

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index fb4d2b7..1146d76 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -40,7 +40,7 @@
     project-name: 'vnfsdk-validation'
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
-    mvn-goals: 'clean install -DskipDocsGeneration=false'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
@@ -70,6 +70,7 @@
       project-name: 'vnfsdk-requirements'
       mvn-settings: 'vnfsdk-validation-settings'
       mvn-global-settings: 'global-settings'
+      mvn-goals: 'clean install -DskipDocsGeneration=false'
       stream:
           - 'master':
                 branch: 'master'

diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
index 23c5fbd..9c511c5 100755 (executable)
--- a/shell/publish_helm_charts.sh
+++ b/shell/publish_helm_charts.sh
@@ -20,8 +20,7 @@ for chart in "${helm_charts[@]}"; do
       curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$GIT_COMMIT/$chart"
       ;;
     'release')
-      echo "Release automation not implemented yet."
-      exit 1
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
         ;;
     *)
       echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."