Merge "Remove all refs to nitrogen in packaging"

[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 bcb79b5f8330ac1f28cc4fa7c8444a596b03f2d4..cffc29bdbbb79b39716f2ada594d6d5fd570cc09 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -15,11 +15,7 @@ $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
@@ -34,4 +30,3 @@ fi
                                          --changelog_email "$CHANGELOG_EMAIL" \
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
-