From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 30 Mar 2020 19:47:06 +0000 (+0000)
Subject: Merge "Verify Helm charts in ric-plt/ric-dep/helm"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=16472d58fdc1edd1bcead7f1268482d835baccf2;hp=491b345e996c6eed86ca71e889200db08177d25f;p=ci-management.git

Merge "Verify Helm charts in ric-plt/ric-dep/helm"
---

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
similarity index 100%
rename from jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g
rename to jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index 073d7449..7915ffc5 100644
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -34,9 +34,7 @@
     container-tag-method: latest
     jobs:
       - gerrit-docker-verify
-      - oran-gerrit-docker-ci-pc-merge:
-          # stage every Saturday
-          cron: 'H H * * 6'
+      - oran-gerrit-docker-ci-pc-merge
     stream:
       - master:
           branch: master
diff --git a/jjb/oam/oam.yaml b/jjb/oam/oam.yaml
index 8e40a7c5..1a9762c3 100644
--- a/jjb/oam/oam.yaml
+++ b/jjb/oam/oam.yaml
@@ -65,7 +65,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
@@ -104,7 +104,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index bf7e817e..5b4766f7 100644
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -73,7 +73,7 @@
         # Source
         sonar.sources=E2Manager
         # Unit tests
-        sonar.go.coverage.reportPaths=coverage.xml
+        sonar.go.coverage.reportPaths=coverage.txt
         # Inclusions
         sonar.inclusions=**/**.go
         # Exclusions
diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
index 9bbd4311..fe441038 100644
--- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
+++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
@@ -26,8 +26,10 @@
     # Use ubuntu base for cmake v3
     # Use docker variant for packagecloud ruby gem
     build-node: ubuntu1804-docker-4c-4g
+    # install alien package to build RPMS
     # install RMR per version file in repo for ubuntu
     pre-build: !include-raw-escape:
+      - ../shell/install-deb-alien.sh
       - ../shell/install-deb-rmr3.sh
 
 # development library - publish only
diff --git a/jjb/scp-oam-modeling/scp-oam-modeling.yaml b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
index cf9f392d..a88461ee 100644
--- a/jjb/scp-oam-modeling/scp-oam-modeling.yaml
+++ b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
@@ -47,7 +47,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
diff --git a/jjb/shell/install-deb-alien.sh b/jjb/shell/install-deb-alien.sh
new file mode 100644
index 00000000..bf9fa687
--- /dev/null
+++ b/jjb/shell/install-deb-alien.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# O-RAN-SC
+#
+# Copyright (C) 2020 AT&T Intellectual Property and Nokia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Installs Debian package 'alien' to support building RPMs
+
+echo "---> install-deb-alien.sh"
+
+# stop on error or unbound var, and be chatty
+set -eux
+
+sudo apt-get update && sudo apt-get -q -y install alien
+
+echo "---> install-deb-alien.sh ends"