Merge "Static code analysis for ric-plt-utils"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 19 Nov 2020 17:45:58 +0000 (17:45 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Thu, 19 Nov 2020 17:45:58 +0000 (17:45 +0000)
global-jjb
jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
jjb/nonrtric/nonrtric.yaml
jjb/ric-plt-tracelibgo/prescan-ric-plt-tracelibgo-ubuntu.sh [new file with mode: 0644]
jjb/ric-plt-tracelibgo/ric-plt-tracelibgo.yaml
jjb/ric-plt-vespamgr/prescan-ric-plt-vespamgr-ubuntu.sh [new file with mode: 0644]
jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml

index 168bf7c..33f5bf5 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 168bf7cebd8b6619449eaa9e7f150fc95b85c873
+Subproject commit 33f5bf5ae760a7c815e39092a216f42ffcc42fbb
index 0106382..92ec847 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
 LABELS=centos7-builder-1c-1g
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
 HARDWARE_ID=v2-highcpu-1
 VOLUME_SIZE=20
index 4d85643..827dbdb 100644 (file)
@@ -28,8 +28,7 @@
     <<: *nonrtric_jdk_common
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
-      - gerrit-maven-docker-verify:
-          mvn-opts: -Dexec.skip=false
+      - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
@@ -44,7 +43,7 @@
     <<: *nonrtric_jdk_common
     name: nonrtric-policy-agent
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f policy-agent'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -67,7 +66,7 @@
     <<: *nonrtric_jdk_common
     name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-opts: '-Ddocker.skip=true'
     mvn-params: '-f sdnc-a1-controller/northbound'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -97,7 +96,7 @@
     <<: *nonrtric_jdk_common
     name: nonrtric-sonar
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
diff --git a/jjb/ric-plt-tracelibgo/prescan-ric-plt-tracelibgo-ubuntu.sh b/jjb/ric-plt-tracelibgo/prescan-ric-plt-tracelibgo-ubuntu.sh
new file mode 100644 (file)
index 0000000..9810fee
--- /dev/null
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+#  Copyright (c) 2019 AT&T Intellectual Property.
+#  Copyright (c) 2018-2019 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.
+#
+#   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+#   platform project (RICP).
+#
+
+
+set -e
+
+export GO111MODULE=on
+go mod download
+go test ./pkg/tracelibgo -v -coverprofile cover.out
index 5b4c628..06a4281 100644 (file)
     stream:
       - master:
           branch: master
+- project:
+    <<: *tracelibgo_docker_common
+    name: ric-plt-tracelibgo-go-sonarqube
+    # docker-enabled nodes have golang
+    # build script needs ubuntu
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-ric-plt-tracelibgo-ubuntu.sh
+    sonar-project-file: ""
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: |
+        # Required metadata
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        # Encoding
+        sonar.build.sourceEncoding=UTF-8
+        # Language
+        sonar.language=go
+        # Source
+        sonar.sources=.
+        # Unit tests
+        sonar.go.coverage.reportPaths=**/cover.out
+        # Inclusions
+        sonar.inclusions=**/*.go
+        # Exclusions
+        sonar.exclusions=**/*_test.go
+    jobs:
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *tracelibgo_docker_common
+    name: ric-plt-tracelibgo-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
diff --git a/jjb/ric-plt-vespamgr/prescan-ric-plt-vespamgr-ubuntu.sh b/jjb/ric-plt-vespamgr/prescan-ric-plt-vespamgr-ubuntu.sh
new file mode 100644 (file)
index 0000000..fba0853
--- /dev/null
@@ -0,0 +1,46 @@
+echo "--> prescan-ric-plt-vespamgr-ubuntu.sh starts"
+
+#!/bin/bash
+#
+#  Copyright (c) 2019 AT&T Intellectual Property.
+#  Copyright (c) 2018-2019 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.
+#
+#   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+#   platform project (RICP).
+#
+
+
+set -e
+set -x
+# Load modules
+GO111MODULE=on go mod download
+export GOPATH=$HOME/go
+export PATH=$GOPATH/bin:$GOROOT/bin:$PATH
+
+# Run vesmgr UT & Coverage
+go test ./... -v -coverprofile cover.out
+
+# setup version tag
+if [ -f container-tag.yaml ]
+then
+    tag=$(grep "tag:" container-tag.yaml | awk '{print $2}')
+else
+    tag="-"
+fi
+
+hash=$(git rev-parse --short HEAD || true)
+
+# Install vesmgr
+go install -ldflags "-X main.Version=$tag -X main.Hash=$hash" -v ./cmd/vesmgr
index f76407f..5c9bb2e 100644 (file)
     stream:
       - master:
           branch: master
+- project:
+    <<: *vespamgr_docker_common
+    name: ric-plt-vespamgr-go-sonarqube
+    # docker-enabled nodes have golang
+    # build script needs ubuntu
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-ric-plt-vespamgr-ubuntu.sh
+    sonar-project-file: ""
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: |
+        # Required metadata
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        # Encoding
+        sonar.build.sourceEncoding=UTF-8
+        # Language
+        sonar.language=go
+        # Source
+        sonar.sources=.
+        # Unit tests
+        sonar.go.coverage.reportPaths=**/cover.out
+        # Inclusions
+        sonar.inclusions=**/*.go
+        # Exclusions
+        sonar.exclusions=**/*_test.go
+    jobs:
+      - gerrit-sonar-prescan-script
 
 - project:
     <<: *vespamgr_docker_common
@@ -46,3 +75,4 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+