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 "Do not trigger distribution-merge by controller"
[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 cffc29bdbbb79b39716f2ada594d6d5fd570cc09..402bc882b89bc892938c8429999bf5e9a9de08ac 100644
(file)
--- a/
jjb/packaging/build-rpm-snap.sh
+++ b/
jjb/packaging/build-rpm-snap.sh
@@
-15,12
+15,17
@@
$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" == "oxygen" ]; then
- VERSION_MAJOR=8
-elif [ "$STREAM" == "fluorine" ]; then
- VERSION_MAJOR=9
+if [ "$STREAM" == "sodium" ]; then
+ VERSION_MAJOR=11
+elif [ "$STREAM" == "magnesium" ]; then
+ VERSION_MAJOR=12
+elif [ "$STREAM" == "aluminium" ]; then
+ VERSION_MAJOR=13
+elif [ "$STREAM" == "silicon" ]; then
+ VERSION_MAJOR=14
else
echo "Unable to convert stream to major version"
else
echo "Unable to convert stream to major version"
+ echo "MAINTAINER: Update if/else switch above with recent stream/ver pairs"
exit 1
fi
exit 1
fi