Merge "Chore: Automation adds ric-app/qp-aimlfw config files"
authorhoejoo lee <hoejoo.lee@samsung.com>
Mon, 21 Nov 2022 11:41:19 +0000 (11:41 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Mon, 21 Nov 2022 11:41:19 +0000 (11:41 +0000)
INFO.yaml [changed mode: 0644->0755]
jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
jjb/pti-rtp/pti-rtp.yaml
jjb/pti-rtp/upload-inf.sh

old mode 100644 (file)
new mode 100755 (executable)
index 4105bdb..ccd03db
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -73,6 +73,16 @@ committers:
     id: "alex.stancu"
     company: "highstreet technologies GmbH"
     timezone: "Europe/Bucharest"
+  - name: "Hoejoo Lee"
+    email: "hoejoo.lee@samsung.com"
+    id: "cromee"
+    company: "samsung electronics"
+    timezone: "Asia/Seoul"
+  - name: "Jackie Huang"
+    email: "jackie.huang@windriver.com"
+    id: "jackiehjm"
+    company: "Wind River"
+    timezone: "Asia/Shanghai"
 tsc:
   # yamllint disable rule:line-length
   approval: "https://wiki.o-ran-sc.org/display/TOC"
@@ -93,3 +103,7 @@ tsc:
       type: "Addition"
       link: "ORANSC TOC 20220505 3.a.i SIM PTL"
       name: "Alex Stancu"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i AIMLFW PTL"
+      name: "Hoejoo Lee"
index b59f294..dd1e0c5 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_de_docker_common: &aiml_de_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-data-extraction-docker-common
+    # git repo
+    project: aiml-fw/athp/data-extraction
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-data-extraction
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-data-extraction-settings
+
+- project:
+    <<: *aiml_de_docker_common
+    name: aiml-fw-athp-data-extraction-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:
+    <<: *aiml_de_docker_common
+    name: aiml-fw-athp-data-extraction-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
index a1611e8..8eeddda 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_kfc_docker_common: &aiml_kfc_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-tps-kubeflow-adapter-docker-common
+    # git repo
+    project: aiml-fw/athp/tps/kubeflow-adapter
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-tps-kubeflow-adapter
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-tps-kubeflow-adapter-settings
+
+- project:
+    <<: *aiml_kfc_docker_common
+    name: aiml-fw-athp-tps-kubeflow-adapter-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:
+    <<: *aiml_kfc_docker_common
+    name: aiml-fw-athp-tps-kubeflow-adapter-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
index 8a93a48..54d8702 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_tm_docker_common: &aiml_tm_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-awmf-tm-docker-common
+    # git repo
+    project: aiml-fw/awmf/tm
+    # jenkins job name prefix
+    project-name: aiml-fw-awmf-tm
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-awmf-tm-settings
+
+- project:
+    <<: *aiml_tm_docker_common
+    name: aiml-fw-awmf-tm-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:
+    <<: *aiml_tm_docker_common
+    name: aiml-fw-awmf-tm-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
index b0a111d..1ee52ba 100644 (file)
     jobs:
       - gerrit-maven-sonar
 
+- project:
+    <<: *rappcatalogue_jdk_common
+    name: nonrtric-plt-enhanced-rappcatalogue-verify
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    python-version: python3.8
+    # skip docs on verify
+    tox-envs: code
+    tox-dir: catalogue-enhanced
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'catalogue-enhanced/.*'
+    stream:
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *rappcatalogue_jdk_common
+    name: nonrtric-plt-rappcatalogue-enhanced-docker
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-plt-rappcatalogue-enhanced'
+    # source of docker tag
+    container-tag-method: yaml-file
+    # use host network
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'catalogue-enhanced'
+    build-node: ubuntu1804-docker-4c-4g
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'catalogue-enhanced/.*'
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *rappcatalogue_jdk_common
+    name: nonrtric-plt-rappcatalogue-enhanced-sonarqube
+    python-version: python3
+    tox-dir: catalogue-enhanced
+    # 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: 'catalogue-enhanced/.*'
+    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=catalogue-enhanced/
+        sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
+        sonar.inclusions=catalogue-enhanced/src/**.py
+        sonar.exclusions=catalogue-enhanced/tests/**.py
+    jobs:
+      - gerrit-tox-sonarqube
index 5913512..e87bbdb 100644 (file)
@@ -45,6 +45,7 @@
     docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
     # get tag from YAML
     container-tag-method: yaml-file
+    container-tag-yaml-dir: capifcore
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # Directory with Dockerfile
index 7befb3b..0553139 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_dashboard_docker_common: &aiml_dashboard_docker_common
+    # values apply to all training manager projects
+    name: portal-aiml-dashboard-docker-common
+    # git repo
+    project: portal/aiml-dashboard
+    # jenkins job name prefix
+    project-name: portal-aiml-dashboard
+    # maven settings file has docker credentials
+    mvn-settings: portal-aiml-dashboard-settings
+
+- project:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-dashboard-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:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-dashboard-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:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-notebook-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: 'kf-pipelines'
+    container-tag-yaml-dir: 'kf-pipelines'
+    # 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
\ No newline at end of file
index 58181a4..ed339b4 100644 (file)
@@ -67,3 +67,5 @@
           branch: master
       - f-release:
           branch: f-release
+      - g-release:
+          branch: g-release
index 4482691..7a5d10d 100644 (file)
@@ -21,16 +21,21 @@ echo "--> upload-inf.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-echo "INFO: creating virtual environment"
-virtualenv -p python3 /tmp/venv
-PATH=/tmp/venv/bin:$PATH
-
-pip_pkgs="pip setuptools lftools"
-for pkg in $pip_pkgs; do
-    cmd_pip="python -m pip install -q --upgrade $pkg"
-    echo "INFO: installing packages: $cmd_pip"
-    $cmd_pip
-done
+if [[ -f ~/lf-env.sh ]]; then
+    source ~/lf-env.sh
+    lf-activate-venv --python python3 lftools
+else
+    echo "INFO: creating virtual environment"
+    virtualenv -p python3 /tmp/venv
+    PATH=/tmp/venv/bin:$PATH
+    
+    pip_pkgs="pip setuptools lftools"
+    for pkg in $pip_pkgs; do
+        cmd_pip="python -m pip install --upgrade $pkg"
+        echo "INFO: installing packages: $cmd_pip"
+        $cmd_pip
+    done
+fi
 
 # NEXUS_URL is set by Jenkins
 nexus_repo_id="images"