From: Anil Belur Date: Fri, 9 Dec 2022 08:27:58 +0000 (+0000) Subject: Merge "Updating Jenkins Job for a1" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b335b2b3aaf2803b9bbdcb1ad3f593cf6513d982;hp=d2c871fd70169b743708e2911dcd013f68fa40f9;p=ci-management.git Merge "Updating Jenkins Job for a1" --- diff --git a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml index dd1e0c53..ffed792b 100644 --- a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml +++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml @@ -51,3 +51,47 @@ stream: - master: branch: master + +- project: + <<: *aiml_de_docker_common + name: aiml-fw-athp-data-extraction-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: 'dataextraction/.*' + stream: + # run verify on all branches + # the ANT pattern is **/{branch}, we are exploiting that. + - all: + branch: master + jobs: + - gerrit-tox-verify + +- project: + <<: *aiml_de_docker_common + name: aiml-fw-athp-data-extraction-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: 'dataextraction/.*' + 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=dataextraction + sonar.python.coverage.reportPaths=coverage.xml + jobs: + - gerrit-tox-sonarqube diff --git a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml index 8eeddda3..850d035f 100644 --- a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml +++ b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml @@ -51,3 +51,47 @@ stream: - master: branch: master + +- project: + <<: *aiml_kfc_docker_common + name: aiml-fw-athp-tps-kubeflow-adapter-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: 'kfadapter/.*' + stream: + # run verify on all branches + # the ANT pattern is **/{branch}, we are exploiting that. + - all: + branch: master + jobs: + - gerrit-tox-verify + +- project: + <<: *aiml_kfc_docker_common + name: aiml-fw-athp-tps-kubeflow-adapter-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: 'kfadapter/.*' + 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=kfadapter + sonar.python.coverage.reportPaths=coverage.xml + jobs: + - gerrit-tox-sonarqube diff --git a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml new file mode 100644 index 00000000..5d70afb7 --- /dev/null +++ b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml @@ -0,0 +1,77 @@ +--- +- project: + name: ric-app-qp-aimlfw-project-view + project-name: ric-app-qp-aimlfw + views: + - project-view + +- project: + name: ric-app-qp-aimlfw-info + project: ric-app/qp-aimlfw + project-name: ric-app-qp-aimlfw + build-node: centos7-builder-1c-1g + branch: master + jobs: + - gerrit-info-yaml-verify + +- qp_aimlfw_docker_common: &qp_aimlfw_docker_common + # values apply to all training manager projects + name: ric-app-qp-aimlfw-docker-common + # git repo + project: ric-app/qp-aimlfw + # jenkins job name prefix + project-name: ric-app-qp-aimlfw + # maven settings file has docker credentials + mvn-settings: ric-app-qp-aimlfw-settings + +- 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 + project-name: '{name}' + # image name + docker-name: 'o-ran-sc/{name}' + # Dockerfile is in a subdir + docker-root: '.' + # source of docker tag + # dockerfile is in subdir of docker root + docker-build-args: '--network=host' + container-tag-method: yaml-file + build-node: ubuntu1804-docker-4c-4g + jobs: + - "{project-name}-gerrit-docker-jobs" + stream: + - master: + branch: master + +- project: + <<: *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: './.*' + 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=. + sonar.language=go + sonar.go.coverage.reportPaths=**/cover.out + sonar.inclusions=**/*.go + sonar.exclusions=**/*_test.go + jobs: + - gerrit-tox-sonarqube + diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml index 50fec4cf..f40a99e1 100644 --- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml +++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml @@ -32,8 +32,7 @@ pre-build: !include-raw-escape: - ../shell/install-deb-alien.sh - ../shell/install-deb-rmr.sh - - ../shell/install-deb-cpprest.sh - - ../shell/install-git-pistache.sh + - ../shell/install-git-RESTful.sh # skip install in cmake-build.sh install: false diff --git a/jjb/shell/install-deb-cpprest.sh b/jjb/shell/install-deb-cpprest.sh deleted file mode 100644 index 2fcf6981..00000000 --- a/jjb/shell/install-deb-cpprest.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# O-RAN-SC -# -# Copyright (C) 2020 AT&T Intellectual Property and 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. - -# Installs Debian package 'alien' to support building RPMs - -echo "---> install-deb-cpprest.sh" - -# stop on error or unbound var, and be chatty -set -eux -sudo apt-get update --fix-missing && sudo apt-get -y install libcpprest-dev - -echo "---> install-deb-cpprest.sh ends" diff --git a/jjb/shell/install-git-RESTful.sh b/jjb/shell/install-git-RESTful.sh new file mode 100755 index 00000000..433e06ab --- /dev/null +++ b/jjb/shell/install-git-RESTful.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# O-RAN-SC +# +# Copyright (C) 2020 AT&T Intellectual Property and 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. + +# Installs Debian package 'pistache' to support building RPMs + +echo "---> install-git-RESTful.sh" + +# stop on error or unbound var, and be chatty +set -eux +echo "---> install RESTful API dependencies..." + +#export PATH=$PATH:~/.local/bin +#export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu + +#building and installing cpprestsdk +sudo apt-get install -y libcpprest-dev + +sudo apt-get install -y g++ git libboost-atomic-dev libboost-thread-dev libboost-system-dev libboost-date-time-dev libboost-regex-dev libboost-filesystem-dev libboost-random-dev libboost-chrono-dev libboost-serialization-dev libwebsocketpp-dev openssl libssl-dev ninja-build zlib1g-dev + +sudo git clone https://github.com/Microsoft/cpprestsdk.git casablanca && \ + cd casablanca && \ + 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 + +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 + + +git clone https://github.com/Tencent/rapidjson && \ + cd rapidjson && \ + mkdir build && \ + cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \ + make install + +cd ../../ + + +#building and installing pistache +git clone https://github.com/pistacheio/pistache.git + +cd pistache && \ + meson setup build \ + --buildtype=release \ + -DPISTACHE_USE_SSL=true \ + -DPISTACHE_BUILD_EXAMPLES=true \ + -DPISTACHE_BUILD_TESTS=true \ + -DPISTACHE_BUILD_DOCS=false \ + --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 +cd ../../ + + +#install nlohmann json +git clone https://github.com/nlohmann/json.git && cd json && cmake . && 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 +cd ../ + + +export LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib +export C_INCLUDE_PATH=/usr/local/include + +echo "---> install-git-RESTful.sh ends" + diff --git a/jjb/shell/install-git-pistache.sh b/jjb/shell/install-git-pistache.sh deleted file mode 100755 index dd7812be..00000000 --- a/jjb/shell/install-git-pistache.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# O-RAN-SC -# -# Copyright (C) 2020 AT&T Intellectual Property and 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. - -# Installs Debian package 'pistache' to support building RPMs - -echo "---> install-git-pistache.sh" - -# stop on error or unbound var, and be chatty -set -eux -echo "---> install Pistache dependencies..." - -export PATH=$PATH:~/.local/bin -export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu - -sudo apt-get update && sudo apt-get -y install rapidjson-dev libssl-dev ninja-build -python3 -m pip install meson - - -git clone https://github.com/pistacheio/pistache.git && cd pistache && meson setup build \ - --buildtype=release \ - -DPISTACHE_USE_SSL=true \ - -DPISTACHE_BUILD_EXAMPLES=false \ - -DPISTACHE_BUILD_TESTS=false \ - -DPISTACHE_BUILD_DOCS=false \ - --prefix="$PWD/prefix" && \ - meson install -C build && \ - sudo cp -rf prefix/include/pistache /usr/include/pistache && \ - sudo cp prefix/lib/x86_64-linux-gnu/libpistache.so.0.0.5 $LIBRARY_PATH && \ - sudo ln -s $LIBRARY_PATH/libpistache.so.0.0.5 $LIBRARY_PATH/libpistache.so.0 && \ - sudo ln -s $LIBRARY_PATH/libpistache.so.0 $LIBRARY_PATH/libpistache.so && \ - sudo ldconfig - -echo "---> install-git-pistache.sh ends"