Merge "Update JJB file for smo/o1 to add support for release and Sonar run"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 12 Dec 2022 20:53:28 +0000 (20:53 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Mon, 12 Dec 2022 20:53:28 +0000 (20:53 +0000)
global-jjb
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/config-params.yaml [moved from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/config-params.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/content [moved from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/content with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.sandbox.yaml [moved from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.sandbox.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.yaml [moved from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.yaml with 100% similarity]
jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml
jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml
jjb/ric-plt-a1/ric-plt-a1.yaml
jjb/shell/install-git-RESTful.sh
jjb/smo-o2/smo-o2.yaml

index 631a7f2..07c62ba 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 631a7f22a7e383d2ed5886e721cd370ff85613d4
+Subproject commit 07c62baeee27086343152a9c89093ca99a9f99d9
index e30c1c5..22b9b8a 100644 (file)
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- aiml_fssdk_docker_common: &aiml_fssdk_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-sdk-feature-store-docker-common
+    # git repo
+    project: aiml-fw/athp/sdk/feature-store
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-sdk-feature-store
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-sdk-feature-store-settings
+
+- project:
+    <<: *aiml_fssdk_docker_common
+    name: aiml-fw-athp-sdk-feature-store-tox-verify
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    python-version: python3
+    # skip docs on verify
+    tox-envs: code
+    tox-dir: '.'
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'featurestoresdk/.*'
+    stream:
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: master
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *aiml_fssdk_docker_common
+    name: aiml-fw-athp-sdk-feature-store-sonarqube
+    python-version: python3
+    tox-dir: '.'
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'featurestoresdk/.*'
+    sonar-project-file: ""
+    sonar-properties: |
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        sonar.build.sourceEncoding=UTF-8
+        sonar.sources=featurestoresdk
+        sonar.python.coverage.reportPaths=coverage.xml
+    jobs:
+      - gerrit-tox-sonarqube
\ No newline at end of file
index 924e0e7..8a3c87d 100644 (file)
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+      
+- aiml_mssdk_docker_common: &aiml_mssdk_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-sdk-model-storage-docker-common
+    # git repo
+    project: aiml-fw/athp/sdk/model-storage
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-sdk-model-storage
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-sdk-model-storage-settings
+
+- project:
+    <<: *aiml_mssdk_docker_common
+    name: aiml-fw-athp-sdk-model-storage-tox-verify
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    python-version: python3
+    # skip docs on verify
+    tox-envs: code
+    tox-dir: '.'
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'modelmetricsdk/.*'
+    stream:
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: master
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *aiml_mssdk_docker_common
+    name: aiml-fw-athp-sdk-model-storage-sonarqube
+    python-version: python3
+    tox-dir: '.'
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'modelmetricsdk/.*'
+    sonar-project-file: ""
+    sonar-properties: |
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        sonar.build.sourceEncoding=UTF-8
+        sonar.sources=modelmetricsdk
+        sonar.python.coverage.reportPaths=coverage.xml
+    jobs:
+      - gerrit-tox-sonarqube
\ No newline at end of file
index 81cf043..8c8cc4e 100644 (file)
     jobs:
       - '{project-name}-gerrit-docker-jobs'
 
-- project:
-    <<: *a1_common
-    name: ric-plt-a1-verify
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-rmr.sh
-    python-version: python3
-    # skip docs on verify
-    tox-envs: code,flake8
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    stream:
-      # run verify on all branches
-      # the ANT pattern is **/{branch}, we are exploiting that.
-      - all:
-          branch: '*'
-    jobs:
-      - gerrit-tox-verify
-
-- project:
-    <<: *a1_common
-    name: ric-plt-a1-nexus-iq
-    build-node: centos7-builder-1c-1g
-    nexus-iq-namespace: oran-
-    jobs:
-      - gerrit-tox-nexus-iq-clm
-
-- project:
-    <<: *a1_common
-    name: ric-plt-a1-sonarqube
-    python-version: python3
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-rmr.sh
-    sonar-project-file: ""
-    sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=a1
-        sonar.python.coverage.reportPaths=coverage.xml
-    jobs:
-      - gerrit-tox-sonarqube
-
 - project:
     <<: *a1_common
     name: ric-plt-a1-release
index 433e06a..3e75c95 100755 (executable)
@@ -34,14 +34,14 @@ sudo apt-get install -y  g++ git libboost-atomic-dev libboost-thread-dev libboos
 
 sudo git clone https://github.com/Microsoft/cpprestsdk.git casablanca && \
     cd casablanca && \
-    mkdir build && \
+    sudo mkdir build && \
     cd build && \
-    cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    ninja && \
-    ninja install && \
-    cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    ninja && \
-    ninja install
+    sudo cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    sudo ninja && \
+    sudo ninja install && \
+    sudo cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    sudo ninja && \
+    sudo ninja install
 
 cd ../../
 
@@ -49,24 +49,24 @@ cd ../../
 
 #installing all dependicies for pistache
 sudo apt-get update && sudo apt-get -y install ninja-build python python3-pip libcurl4-openssl-dev libssl-dev pkg-config
-python3 -m pip install meson
+sudo python3 -m pip install meson
 
 
 git clone https://github.com/Tencent/rapidjson && \
         cd rapidjson && \
-        mkdir build && \
+        sudo mkdir build && \
         cd build && \
-        cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-        make install
+        sudo cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+        sudo make install
 
 cd ../../
 
 
 #building and installing pistache
-git clone https://github.com/pistacheio/pistache.git
+sudo git clone https://github.com/pistacheio/pistache.git
 
 cd pistache && \
-    meson setup build \
+    sudo meson setup build \
     --buildtype=release \
     -DPISTACHE_USE_SSL=true \
     -DPISTACHE_BUILD_EXAMPLES=true \
@@ -75,18 +75,18 @@ cd pistache && \
     --prefix="/usr/local"
 
 cd build && \
-   ninja && \
-   ninja install
-cp /usr/local/lib/x86_64-linux-gnu/libpistache* /usr/local/lib/
-cp /usr/local/lib/x86_64-linux-gnu/pkgconfig/libpistache.pc /usr/local/lib/pkgconfig
+   sudo ninja && \
+   sudo ninja install
+sudo cp /usr/local/lib/x86_64-linux-gnu/libpistache* /usr/local/lib/
+sudo cp /usr/local/lib/x86_64-linux-gnu/pkgconfig/libpistache.pc /usr/local/lib/pkgconfig
 cd ../../
 
 
 #install nlohmann json
-git clone https://github.com/nlohmann/json.git && cd json && cmake . && make install
+sudo git clone https://github.com/nlohmann/json.git && cd json && sudo cmake . && sudo make install
 cd ../
 #install json-schema-validator
-git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator &&mkdir build &&cd build && cmake .. && make install
+sudo git clone https://github.com/pboettch/json-schema-validator.git && cd json-schema-validator &&sudo mkdir build &&cd build && sudo cmake .. && sudo make install
 cd ../
 
 
index 3fdb5ca..409a386 100644 (file)
     jobs:
       - gerrit-info-yaml-verify
 
-- smo_o2_docker_common: &smo_o2_docker_common
-    # values apply to all docker projects
-    name: smo-o2-docker-common
+- smo_o2_common: &smo_o2_common
+    # values apply to all projects
+    name: smo-o2-common
     # git repo
     project: smo/o2
     # jenkins job name prefix
     project-name: smo-o2
     # maven settings file has docker credentials
     mvn-settings: smo-o2-settings
+    # Sonar settings
+    sonarcloud-project-key: "smo-o2"
+    sonarcloud-project-organization: "o-ran-sc"
 
 - project:
-    <<: *smo_o2_docker_common
+    <<: *smo_o2_common
     name: smo-o2-release
     project-name: '{name}'
     # maven release requires sigul which requires centos
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *smo_o2_common
+    name: smo-o2-sonarqube
+    python-version: python3
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    # impt for verify and tox etc
+    tox-envs: code,flake8
+    sonarcloud: true
+    sonar-project-file: ""
+    sonar-properties: |
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.sources=collector
+      sonar.python.coverage.reportPaths=coverage.xml
+    jobs:
+      - gerrit-cli-sonar