Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update to global-jjb v0.29.0"
[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..7076350381c4057f3a25b5b6b4cc6c462342bb60 100644
(file)
--- a/
jjb/packaging/build-rpm-snap.sh
+++ b/
jjb/packaging/build-rpm-snap.sh
@@
-15,12
+15,12
@@
$PYTHON -m pip install --upgrade pip
$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
# Convert stream to numeric ODL major version
$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
VERSION_MAJOR=8
+elif [ "$STREAM" == "fluorine" ]; then
+ VERSION_MAJOR=9
+elif [ "$STREAM" == "neon" ]; then
+ VERSION_MAJOR=10
else
echo "Unable to convert stream to major version"
exit 1
else
echo "Unable to convert stream to major version"
exit 1
@@
-32,4
+32,3
@@
fi
--changelog_email "$CHANGELOG_EMAIL" \
latest_snap \
--major "$VERSION_MAJOR"
--changelog_email "$CHANGELOG_EMAIL" \
latest_snap \
--major "$VERSION_MAJOR"
-