X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpti-rtp%2Fupload-inf.sh;h=448269167d51e0865af4c19c29d14e20052d2691;hb=78520aa26c58c5b77e1ccf54c46a0c796a33bd2c;hp=d95b282c19ac388767b4e1716e17e5400bb8287d;hpb=6c667dc97080a9a8677b78ab16d792995e1c7ccd;p=ci-management.git

diff --git a/jjb/pti-rtp/upload-inf.sh b/jjb/pti-rtp/upload-inf.sh
index d95b282c..44826916 100644
--- a/jjb/pti-rtp/upload-inf.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -24,9 +24,13 @@ set -eu -o pipefail
 echo "INFO: creating virtual environment"
 virtualenv -p python3 /tmp/venv
 PATH=/tmp/venv/bin:$PATH
-pipup="python -m pip install -q --upgrade lftools"
-echo "INFO: installing packages: $pipup"
-$pipup
+
+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
 
 # NEXUS_URL is set by Jenkins
 nexus_repo_id="images"
@@ -34,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"