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 "Remove messaging4transport carbon jobs"
[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..20f632e71618c02e6da44196c18478497d5d1725 100644
(file)
--- a/
jjb/packaging/build-rpm-snap.sh
+++ b/
jjb/packaging/build-rpm-snap.sh
@@
-15,9
+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
$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
+if [ "$STREAM" == "nitrogen" ]; then
VERSION_MAJOR=7
elif [ "$STREAM" == "oxygen" ]; then
VERSION_MAJOR=8
VERSION_MAJOR=7
elif [ "$STREAM" == "oxygen" ]; then
VERSION_MAJOR=8
@@
-34,4
+32,3
@@
fi
--changelog_email "$CHANGELOG_EMAIL" \
latest_snap \
--major "$VERSION_MAJOR"
--changelog_email "$CHANGELOG_EMAIL" \
latest_snap \
--major "$VERSION_MAJOR"
-