X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fbuild-rpm-snap.sh;h=64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b;hb=6292a126503af27728e3ef73183c36f9fd3d4be9;hp=7587d2a68e6a271b7fc868b5b78db7c6edb6191e;hpb=26c20ade21e2629099602ca890b9a67f2b9a2586;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index 7587d2a68..64c8ff1f0 100644
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -12,17 +12,38 @@ virtualenv rpm_build
 source rpm_build/bin/activate
 PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
-$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
+
+# Convert stream to numeric ODL major version
+if [ "$STREAM" == "carbon" ]; then
+  VERSION_MAJOR=6
+elif [ "$STREAM" == "nitrogen" ]; then
+  VERSION_MAJOR=7
+elif [ "$STREAM" == "oxygen" ]; then
+  VERSION_MAJOR=8
+else
+  echo "Unable to convert stream to major version"
+  exit 1
+fi
 
 # Build the latest snapshot matching the given major minor version
-"$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
-                                  --major "$VERSION_MAJOR" \
-                                  --minor "$VERSION_MINOR" \
-                                  --changelog_name "$CHANGELOG_NAME" \
-                                  --changelog_email "$CHANGELOG_EMAIL"
+"$WORKSPACE/packaging/packages/build.py" --rpm \
+                                         --changelog_name "$CHANGELOG_NAME" \
+                                         --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