Merge "Fix: Correct SIGUL_BRIDGE_IP global var"

diff --git a/INFO.yaml b/INFO.yaml
index 003d2f6..4105bdb 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -53,9 +53,43 @@ committers:
     company: "The Linux Foundation"
     id: "kevin.sandi"
     timezone: "Unknown/Unknown"
+  - name: "Mahesh Jethanandani"
+    email: "mjethanandani@gmail.com"
+    company: "Xoriant Corporation"
+    id: "mjethanandani"
+    timezone: "America/Los_Angeles"
+  - name: "John Keeney"
+    email: "John.Keeney@est.tech"
+    id: "johnkeeney"
+    company: "Ericsson Software Technology"
+    timezone: "Europe/Dublin"
+  - name: "Martin Skorupski"
+    email: "martin.skorupski@highstreet-technologies.com"
+    id: "demx8as6"
+    company: "highstreet technologies GmbH"
+    timezone: "Germany/Berlin"
+  - name: "Alex Stancu"
+    email: "alexandru.stancu@highstreet-technologies.com"
+    id: "alex.stancu"
+    company: "highstreet technologies GmbH"
+    timezone: "Europe/Bucharest"
 tsc:
+  # yamllint disable rule:line-length
   approval: "https://wiki.o-ran-sc.org/display/TOC"
   changes:
-    - type: ""
-      name: ""
-      link: ""
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i SMO PTL"
+      name: "Mahesh Jethanandani"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i NONRTRIC PTL"
+      name: "John Keeney"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i OAM PTL"
+      name: "Martin Skorupski"
+    -
+      type: "Addition"
+      link: "ORANSC TOC 20220505 3.a.i SIM PTL"
+      name: "Alex Stancu"

diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml
index 4d9fa57..5a492be 100644 (file)
--- a/jjb/it-test/it-test.yaml
+++ b/jjb/it-test/it-test.yaml
@@ -68,6 +68,24 @@
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
 
+- project:
+    <<: *it_test_common
+    name: it-test-ric-benchmarking
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # start in parent directory with shared files
+    docker-root:  ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host -f Dockerfile'
+    # tag file is in subdir
+    container-tag-yaml-dir: ric_benchmarking/e2-interface/e2sim/docker
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'ric_benchmarking/e2-interface/.*'
+
 - project:
     <<: *it_test_common
     name: it-test-release

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index 4991caa..58181a4 100644 (file)
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -62,3 +62,8 @@
         - upload-inf.sh
     jobs:
       - oran-shell-release
+    stream:
+      - master:
+          branch: master
+      - f-release:
+          branch: f-release

diff --git a/jjb/pti-rtp/upload-inf.sh b/jjb/pti-rtp/upload-inf.sh
index afcdd26..4482691 100644 (file)
--- a/jjb/pti-rtp/upload-inf.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -38,17 +38,24 @@ nexus_repo_url="$NEXUS_URL/content/sites/$nexus_repo_id"
 echo "INFO: upload to $nexus_repo_url"
 
 repo_dir="$WORKSPACE/nexus/$nexus_repo_id"
-# TODO: get build or version string; use latest for now
-repo_iso_dir="$repo_dir/org/o-ran-sc/pti/rtp/latest"
-echo "INFO: create staging directory $repo_iso_dir"
-mkdir -p "$repo_iso_dir"
-
-# Expect ISO file: oran-image-inf-host-intel-x86-64.iso
-# in build subdir: workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/
-#iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
-iso="workspace/prj_oran_inf_anaconda/tmp-glibc/deploy/images/intel-corei7-64/inf-image-aio-installer-intel-corei7-64.iso"
-echo "INFO: copy $iso to staging directory $repo_iso_dir"
-cp "$iso" "$repo_iso_dir"
+repo_iso_dir_latest="$repo_dir/org/o-ran-sc/pti/rtp/latest"
+repo_iso_dir_branch="$repo_dir/org/o-ran-sc/pti/rtp/$GERRIT_BRANCH"
+echo "INFO: create staging directory $repo_iso_dir_latest and $repo_iso_dir_branch"
+mkdir -p "$repo_iso_dir_latest" "$repo_iso_dir_branch"
+
+# Expect Yocto based ISO file: inf-image-yocto-aio-x86-64.iso
+# in build subdir: workspace/workspace_yocto/prj_output/
+iso_yocto="workspace/workspace_yocto/prj_output/inf-image-yocto-aio-x86-64.iso"
+
+# Expect CentOS based ISO file: inf-image-centos-all-x86-64.iso
+# in build subdir: workspace/workspace_centos/prj_output/
+iso_centos="workspace/workspace_centos/prj_output/inf-image-centos-all-x86-64.iso"
+
+echo "INFO: copy $iso_yocto and $iso_centos to staging directory $repo_iso_dir_latest"
+cp "$iso_yocto" "$iso_centos" "$repo_iso_dir_latest"
+
+echo "INFO: copy $iso_yocto and $iso_centos to staging directory $repo_iso_dir_branch"
+cp "$iso_yocto" "$iso_centos" "$repo_iso_dir_branch"
 
 cmd="lftools deploy nexus $nexus_repo_url $repo_dir"
 echo "INFO: Upload ISO to Nexus: $cmd"

diff --git a/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml b/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml
new file mode 100644 (file)
index 0000000..cf72e52
--- /dev/null
+++ b/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: sim-ns3-o-ran-e2-project-view
+    project-name: sim-ns3-o-ran-e2
+    views:
+      - project-view
+
+- project:
+    name: sim-ns3-o-ran-e2-info
+    project: sim/ns3-o-ran-e2
+    project-name: sim-ns3-o-ran-e2
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/smo-o2/smo-o2.yaml b/jjb/smo-o2/smo-o2.yaml
new file mode 100644 (file)
index 0000000..3fdb5ca
--- /dev/null
+++ b/jjb/smo-o2/smo-o2.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+    name: smo-o2-project-view
+    project-name: smo-o2
+    views:
+      - project-view
+
+- project:
+    name: smo-o2-info
+    project: smo/o2
+    project-name: smo-o2
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- smo_o2_docker_common: &smo_o2_docker_common
+    # values apply to all docker projects
+    name: smo-o2-docker-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
+
+- project:
+    <<: *smo_o2_docker_common
+    name: smo-o2-release
+    project-name: '{name}'
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 12d221e..9f6ba64 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -70,6 +70,21 @@
     stream:
       - master:
           branch: master
+- project:
+    <<: *ves_docker_common
+    name: smo-postconfig
+    project-name: '{name}'
+    # image name
+    docker-name: 'smo-post-config'
+    # Dockerfile is in a subdir
+    docker-root: postconfig
+    # source of docker tag
+    container-tag-method: yaml-file
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *ves_docker_common
@@ -107,8 +122,10 @@
     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
+    pre-build-script: !include-raw-escape:
+      - ../shell/install-deb-rmr.sh
+    # impt for verify and tox etc
+    tox-envs: code,flake8
     sonar-project-file: ""
     sonar-properties: |
       sonar.login={sonarcloud_api_token}
@@ -116,7 +133,7 @@
       sonar.projectName={project-name}
       sonar.organization={sonarcloud_project_organization}
       sonar.build.sourceEncoding=UTF-8
-      sonar.sources=a1
+      sonar.sources=collector
       sonar.python.coverage.reportPaths=coverage.xml
-      jobs:
-        - gerrit-tox-sonarqube
+    jobs:
+      - gerrit-tox-sonarqube