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 4e9c2cb05e29888151eb30382bb9b21ef783c586..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,4 +30,3 @@ fi
                                          --changelog_email "$CHANGELOG_EMAIL" \
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
-