X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fbuild-rpm-snap.sh;h=bcb79b5f8330ac1f28cc4fa7c8444a596b03f2d4;hb=21164b8471b6680cc93d5f128e25d5b71af7cd38;hp=9ff3b41f7e7d6ea76d28767c796f484644e78e92;hpb=bb03001531c4dc265c3596c978c7f0b861ddfbe0;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index 9ff3b41f7..bcb79b5f8 100644
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -14,15 +14,24 @@ PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
 $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
+elif [ "$STREAM" == "fluorine" ]; then
+  VERSION_MAJOR=9
+else
+  echo "Unable to convert stream to major version"
+  exit 1
+fi
+
 # Build the latest snapshot matching the given major minor version
-"$WORKSPACE/packaging/packages/build.py" --rpm --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 "$_"