- Added release job for qp-aimlfw

- Modified sonar job for qp-aimlfw

Signed-off-by: minhac.lee <minhac.lee@samsung.com>
Change-Id: Icd46d360125266ad34765fc706c49d2b118cfa5a

diff --git a/jjb/ric-app-qp-aimlfw/prescan-ric-app-qp-aimlfw-ubuntu.sh b/jjb/ric-app-qp-aimlfw/prescan-ric-app-qp-aimlfw-ubuntu.sh
new file mode 100644 (file)
index 0000000..22edab6
--- /dev/null
+++ b/jjb/ric-app-qp-aimlfw/prescan-ric-app-qp-aimlfw-ubuntu.sh
@@ -0,0 +1,30 @@
+#==================================================================================
+#      Copyright (c) 2022 Samsung Electronics Co., Ltd. All Rights Reserved.
+#
+#  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-ric-app-qp-aimlfw-ubuntu.sh"
+
+docker --version
+echo "Unit Test"
+cd $WORKSPACE
+
+
+docker build --network=host -t tmpimg --target=qpaimlfwbuild .
+CONTAINER=$(docker create tmpimg)
+docker cp $CONTAINER:/tmp/qp_cover.out cover.out
+docker rm $CONTAINER
+
+echo "--> prescan-ric-app-qp-aimlfw.sh ends"

diff --git a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
index 5d70afb..34a6544 100644 (file)
--- a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
+++ b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
@@ -26,16 +26,7 @@
 
 - project:
     <<: *qp_aimlfw_docker_common
-    name: ric-app-qp-aimlfw-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:
-    <<: *qp_aimlfw_docker_common
-    name: ric-app-qp-aimlfw-docker
+    name: ric-app-qp-aimlfw
     project-name: '{name}'
     # image name
     docker-name: 'o-ran-sc/{name}'
@@ -56,10 +47,8 @@
     <<: *qp_aimlfw_docker_common
     name: ric-app-qp-aimlfw-sonarqube
     # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: './.*'
+    build-node: ubuntu1804-builder-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-ric-app-qp-aimlfw-ubuntu.sh
     sonar-project-file: ""
     sonar-properties: |
         sonar.login={sonarcloud_api_token}
@@ -73,5 +62,12 @@
         sonar.inclusions=**/*.go
         sonar.exclusions=**/*_test.go
     jobs:
-      - gerrit-tox-sonarqube
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *qp_aimlfw_docker_common
+    name: ric-app-qp-aimlfw-release
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'