Merge "Updating ncmp-dmi-plugin jjb project name"

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 7d41914..15795df 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -33,36 +33,6 @@
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: vnfsdk-ves-agent-sonar
-    jobs:
-      - gerrit-maven-sonar
-      - gerrit-cmake-sonar:
-          build-timeout: 60
-          pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
-          build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
-          cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage'
-          sonarcloud-api-token: '{sonarcloud_api_token}'
-          sonarcloud-organization: '{sonarcloud_project_organization}'
-          sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent'
-          make-opts: -j6
-          stream: master
-          build-node: centos7-builder-4c-4g
-    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: 'vnfsdk/ves-agent'
-    project-name: 'vnfsdk-ves-agent'
-    branch: 'master'
-    mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
-    mvn-settings: 'vnfsdk-ves-agent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
 - project:
     name: vnfsdk-ves-agent-info
     jobs:

diff --git a/packer/common-packer b/packer/common-packer
index 74b6be7..3494343 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad7
+Subproject commit 3494343faf0fc4221bfdb6cefc8bc0af0452f980

diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
index d899043..937f0e7 100755 (executable)
--- a/shell/helm-repo-init.sh
+++ b/shell/helm-repo-init.sh
@@ -8,3 +8,4 @@ chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage
 source helm.prop
 $HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git
 $HELM_BIN repo add local http://localhost:6464
+$HELM_BIN repo add onap http://localhost:6464

diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
index 9c511c5..a6a09eb 100755 (executable)
--- a/shell/publish_helm_charts.sh
+++ b/shell/publish_helm_charts.sh
@@ -11,16 +11,13 @@ for chart in "${helm_charts[@]}"; do
   chart=$(echo "$chart" | xargs)
   case "$BUILD_TYPE" in
     'snapshot')
-      echo "-n --upload-file $chart https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart"
-      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart"
-      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE//$GERRIT_BRANCH/$GIT_COMMIT/$chart"
+      curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/"
       ;;
     'staging')
-      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart"
-      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$GIT_COMMIT/$chart"
+      curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/"
       ;;
     'release')
-      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/"
         ;;
     *)
       echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."