From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 4 Jan 2021 17:15:48 +0000 (+0000)
Subject: Merge "Add Slice-analysis-ms csit jobs"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f4f78ae24e975e7eb9f5f884b5324f37d59a6b30;hp=c8cdd687ce922c5a7dca6624b3dbf68bc8744b4d;p=ci-management.git

Merge "Add Slice-analysis-ms csit jobs"
---

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index b0cbe0774..96ee7bd5e 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20201211-071340.623
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm -  - 20201212-033204.217
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=50
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 3281356c6..f962c1473 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,8 +3,7 @@
     name: ccsdk-distribution
     project-name: 'ccsdk-distribution'
     jobs:
-      - gerrit-maven-verify:
-          mvn-params: '-Ddocker.skip.push=true -P docker'
+      - gerrit-maven-verify
       - gerrit-maven-merge:
           cron: '@daily'
       - gerrit-maven-stage:
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index e8fb13a47..2697d1871 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -199,7 +199,7 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-{stream}-stage-helm'
+    name: '{project-name}-{stream}-release-helm'
     # Job template for Helm stage jobs
 
     <<: *helm_job_boiler_plate
@@ -211,12 +211,10 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - pollscm:
-          cron: '0 22 * * *'
       - gerrit:
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: '^stage-helm$'
+                comment-contains-value: '^release-helm$'
 
     builders:
       - lf-infra-pre-build
@@ -229,7 +227,7 @@
           server-id: oom-helm
       - inject:
           properties-content: |
-            BUILD_TYPE=staging
+            BUILD_TYPE=release
       - shell: '{obj:post_build_script}'
       - lf-provide-maven-settings-cleanup
 
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 9263a28a0..46da25852 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -18,7 +18,6 @@
       cd kubernetes/
       make HELM_BIN=helm3 common
       make HELM_BIN=helm3 {subproject}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
 
     stream:
       - "master":
@@ -50,9 +49,8 @@
           build-timeout: 240
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
-      - "{project-name}-{stream}-stage-helm":
+      - "{project-name}-{stream}-release-helm":
           build_script: "{oom_build_script}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
diff --git a/jjb/policy-clamp/policy-clamp.yaml b/jjb/policy-clamp/policy-clamp.yaml
deleted file mode 100644
index 124d84814..000000000
--- a/jjb/policy-clamp/policy-clamp.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- 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/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
new file mode 100644
index 000000000..2fbbf7084
--- /dev/null
+++ b/jjb/policy/policy-clamp.yaml
@@ -0,0 +1,78 @@
+---
+- project:
+    name: policy-clamp
+    project-name: 'policy-clamp'
+    jobs:
+      - gerrit-maven-stage:
+          build-node: ubuntu1804-docker-8c-16g
+          maven-versions-plugin: true
+          sign-artifacts: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-{stream}-verify-java':
+          mvn-params: '-P docker'
+          build-node: ubuntu1804-docker-8c-16g
+      - '{project-name}-{stream}-merge-java':
+         mvn-params: '-P docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
+    project: 'policy/clamp'
+    stream:
+        - 'master':
+              branch: 'master'
+        - 'frankfurt':
+              branch: 'frankfurt'
+        - 'guilin':
+              branch: 'guilin'
+        - 'tosca-poc':
+              branch: 'tosca-poc'
+    mvn-settings: 'policy-clamp-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: policy-clamp-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-docker-8c-8g
+    project: 'policy/clamp'
+    project-name: 'policy-clamp'
+    branch: 'master'
+    mvn-settings: 'policy-clamp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+
+- project:
+    name: policy-clamp-clm
+    jobs:
+      - gerrit-maven-clm:
+    nexus-iq-namespace: 'onap-'
+    project: 'policy/clamp'
+    project-name: 'policy-clamp'
+    branch: 'master'
+    mvn-settings: 'policy-clamp-settings'
+    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk11
+
+- project:
+    name: policy-clamp-info
+    project-name: policy-clamp
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: policy/clamp
+    branch: master
diff --git a/jjb/vnfsdk/upload-artifact.sh b/jjb/vnfsdk/upload-artifact.sh
index 3e07fd5d9..f384f4725 100644
--- a/jjb/vnfsdk/upload-artifact.sh
+++ b/jjb/vnfsdk/upload-artifact.sh
@@ -6,9 +6,9 @@ then
     exit 1
 else
     cd $WORKSPACE/generated/active-validation-rules/Honolulu/
-    for file in *.csv ; do
-        echo "-n --upload-file $file https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"
-        curl -n --upload-file "$file" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"
+    for FILE_NAME in *.csv ; do
+        echo "-n --upload-file $FILE_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME"
+        curl -n --upload-file "$FILE_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$FILE_NAME"
     done
     exit 0
 fi
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index b95c3a766..55a011703 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -76,5 +76,5 @@
       jobs:
           - '{project-name}-{stream}-build-and-upload':
                 pre_script: !include-raw-escape: ./generate-dosc.sh
-                project_id: org.onap.vnfsdk.refrepo
+                project_id: org.onap.vnfsdk.validation
                 post_script: !include-raw-escape: ./upload-artifact.sh
diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh
index 6bf1338e3..c3b0a36d6 100755
--- a/shell/helm-repo-init.sh
+++ b/shell/helm-repo-init.sh
@@ -3,6 +3,7 @@
 set -e -o pipefail
 
 mkdir -p ".chartstorage"
-chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &
+sudo mount -t tmpfs -o size=128M tmpfs .chartstorage
+chartmuseum --debug --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &
 helm3 plugin install https://github.com/chartmuseum/helm-push.git
 helm3 repo add local http://localhost:6464