From: Jessica Wagantall Date: Mon, 12 Dec 2022 20:53:28 +0000 (+0000) Subject: Merge "Update JJB file for smo/o1 to add support for release and Sonar run" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e427bf898dd5264b547b64fcfd80e9b829d75f3c;hp=6cdc60855e576a329a6ebcb52ab2c2643e0dd5d1;p=ci-management.git Merge "Update JJB file for smo/o1 to add support for release and Sonar run" --- diff --git a/global-jjb b/global-jjb index 631a7f22..07c62bae 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 631a7f22a7e383d2ed5886e721cd370ff85613d4 +Subproject commit 07c62baeee27086343152a9c89093ca99a9f99d9 diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/config-params.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/config-params.yaml rename to jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/config-params.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/content b/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/content similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/content rename to jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.sandbox.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.sandbox.yaml rename to jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.yaml similarity index 100% rename from jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw/serverCredentialMappings.yaml rename to jenkins-config/managed-config-files/mavenSettings/ric-app-qp-aimlfw-settings/serverCredentialMappings.yaml diff --git a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml index e30c1c5f..22b9b8a1 100644 --- a/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml +++ b/jjb/aiml-fw-athp-sdk-feature-store/aiml-fw-athp-sdk-feature-store.yaml @@ -12,4 +12,58 @@ 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 diff --git a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml index 924e0e79..8a3c87da 100644 --- a/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml +++ b/jjb/aiml-fw-athp-sdk-model-storage/aiml-fw-athp-sdk-model-storage.yaml @@ -12,4 +12,58 @@ 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 diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml index 81cf0432..8c8cc4ef 100644 --- a/jjb/ric-plt-a1/ric-plt-a1.yaml +++ b/jjb/ric-plt-a1/ric-plt-a1.yaml @@ -43,56 +43,6 @@ 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 diff --git a/jjb/shell/install-git-RESTful.sh b/jjb/shell/install-git-RESTful.sh index 433e06ab..3e75c955 100755 --- a/jjb/shell/install-git-RESTful.sh +++ b/jjb/shell/install-git-RESTful.sh @@ -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 ../ diff --git a/jjb/smo-o2/smo-o2.yaml b/jjb/smo-o2/smo-o2.yaml index 3fdb5ca7..409a3866 100644 --- a/jjb/smo-o2/smo-o2.yaml +++ b/jjb/smo-o2/smo-o2.yaml @@ -13,18 +13,21 @@ 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 @@ -32,3 +35,24 @@ 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