Merge "Extract common RPM test builder steps to macro"

[releng/builder.git] / jjb / packaging / build-rpm-snap.sh

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index cd559d4622f3006b7e838b2760dfb1bd7a1ce398..64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -14,14 +14,8 @@ PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
-# Extract stream from job name (format: foo-job-name-<stream>)
-# shellcheck disable=SC1083
-STREAM=${{JOB_NAME##*-}}
-
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "boron" ]; then
-  VERSION_MAJOR=5
-elif [ "$STREAM" == "carbon" ]; then
+if [ "$STREAM" == "carbon" ]; then
   VERSION_MAJOR=6
 elif [ "$STREAM" == "nitrogen" ]; then
   VERSION_MAJOR=7
@@ -33,13 +27,23 @@ else
 fi
 
 # Build the latest snapshot matching the given major minor version
-"$WORKSPACE/packaging/packages/build.py" --rpm --build-latest-snap \
-                                         --major "$VERSION_MAJOR" \
+"$WORKSPACE/packaging/packages/build.py" --rpm \
                                          --changelog_name "$CHANGELOG_NAME" \
-                                         --changelog_email "$CHANGELOG_EMAIL"
+                                         --changelog_email "$CHANGELOG_EMAIL" \
+                                         latest_snap \
+                                         --major "$VERSION_MAJOR"
 
-# Copy the rpm to be upload
-UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
-mkdir -p "$UPLOAD_FILES_PATH"
-mv "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
-mv "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
+# Publish RPMs to Nexus if in production Jenkins, else host on sandbox Jenkins
+if [ "$SILO" == "sandbox" ]; then
+  # TODO: Host RPMs on Jenkins temporarily
+  echo "Not uploading RPMs to Nexus because running in sandbox"
+elif  [ "$SILO" == "releng" ]; then
+  # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
+  UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
+  mkdir -p "$UPLOAD_FILES_PATH"
+  cp "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
+  cp "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
+else
+  echo "Unknown Jenkins silo: $SILO"
+  exit 1
+fi