Merge "Setting up docker job config for rapp ics version"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 17 Mar 2022 17:00:42 +0000 (17:00 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Thu, 17 Mar 2022 17:00:42 +0000 (17:00 +0000)
jjb/nonrtric-plt-dmaapmediatorproducer/nonrtric-plt-dmaapmediatorproducer.yaml
jjb/nonrtric-plt-dmaapmediatorproducer/prescan-dmaapmediatorproducer-ubuntu.sh [new file with mode: 0644]
jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties [new file with mode: 0644]
jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
jjb/nonrtric/nonrtric.yaml

index 43bb3b0..87dc30b 100644 (file)
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- dmaapmediatorproducer_common: &dmaapmediatorproducer_common
+    name: dmaapmediatorproducer-common
+    # git repo
+    project: nonrtric/plt/dmaapmediatorproducer
+    # jenkins job name prefix
+    project-name: nonrtric-plt-dmaapmediatorproducer
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-dmaapmediatorproducer-settings
+
+- project:
+    <<: *dmaapmediatorproducer_common
+    name: nonrtric-plt-dmaapmediatorproducer-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *dmaapmediatorproducer_common
+    name: nonrtric-plt-dmaapmediatorproducer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-plt-dmaapmediatorproducer'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: '.'
+    # Directory where go test should be run
+    go-root: '.'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *dmaapmediatorproducer_common
+    name: nonrtric-plt-dmaapmediatorproducer-sonar
+    project-name: nonrtric-plt-dmaapmediatorproducer
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-dmaapmediatorproducer-ubuntu.sh
+    sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw: sonar-project.properties
+    jobs:
+      - gerrit-sonar-prescan-script
diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/prescan-dmaapmediatorproducer-ubuntu.sh b/jjb/nonrtric-plt-dmaapmediatorproducer/prescan-dmaapmediatorproducer-ubuntu.sh
new file mode 100644 (file)
index 0000000..a45e0ab
--- /dev/null
@@ -0,0 +1,30 @@
+#!/bin/sh
+##############################################################################
+#
+#   Copyright (C) 2021: Nordix Foundation
+#
+#   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.
+#
+##############################################################################
+
+echo "--> prescan-dmaapmediatorproducer-ubuntu.sh"
+
+set -ex
+
+# Assumes ubuntu - uses apt-get
+sudo apt-get update
+
+# build script execution
+bash ./build-dmaapmediatorproducer-ubuntu.sh
+
+echo "--> prescan-dmaapmediatorproducer-ubuntu.sh ends"
diff --git a/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties b/jjb/nonrtric-plt-dmaapmediatorproducer/sonar-project.properties
new file mode 100644 (file)
index 0000000..cfb4092
--- /dev/null
@@ -0,0 +1,16 @@
+# Required metadata
+sonar.login={sonarcloud_api_token}
+sonar.projectKey={sonarcloud_project_organization}_{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=coverage.txt
+# Inclusions
+sonar.inclusions=main.go,internal/**/**.go
+# Exclusions
+sonar.exclusions=main_test.go,mocks/**.go,stub/**.go,internal/**/**_test.go
index 14c579f..4893678 100644 (file)
       - master:
           branch: master
 
-# nonrtric:r-app-catalogue
-# Maven artifacts for r-app-catalogue
+# nonrtric:rappcatalogue
+# Maven artifacts for rappcatalogue
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f r-app-catalogue'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'r-app-catalogue/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
index d17a9b5..55c2ab6 100644 (file)
       - dawn:
           branch: dawn
 
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-dmaap-mediator-producer
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer'
-    # get tag from YAML
-    container-tag-method: yaml-file
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
-    # Directory with Dockerfile
-    docker-root: 'dmaap-mediator-producer'
-    # Directory where go test should be run
-    go-root: 'dmaap-mediator-producer'
-    # Limit build trigger to appropriate files
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'dmaap-mediator-producer/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    # Includes verify and merge jobs
-    jobs:
-      - "{project-name}-gerrit-docker-jobs"
-      - gerrit-go-verify
-    stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
-
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-dmaap-mediator-producer-sonar
-    project-name: nonrtric-dmaap-mediator-producer
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
-    build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-dmaapmediatorproducer-ubuntu.sh
-    sonar-project-file: ""
-    java-version: openjdk11
-    # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw: sonar-project.properties
-    jobs:
-      - gerrit-sonar-prescan-script
-
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-release