Merge "Switch global-jjb jobs to use mvn35"

[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 64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b..cffc29bdbbb79b39716f2ada594d6d5fd570cc09 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -15,12 +15,10 @@ $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
+if [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
+elif [ "$STREAM" == "fluorine" ]; then
+  VERSION_MAJOR=9
 else
   echo "Unable to convert stream to major version"
   exit 1
@@ -32,18 +30,3 @@ fi
                                          --changelog_email "$CHANGELOG_EMAIL" \
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
-
-# 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