Merge "CI: Updating the docker build parameter for it-test job"

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/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 137760a..9f6ba64 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -122,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}