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 changes from topic 'cleanup-maven'
[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 9843af94509d10d2fffcc60f367c54d7b56424e3..64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b 100644
(file)
--- a/
jjb/packaging/build-rpm-snap.sh
+++ b/
jjb/packaging/build-rpm-snap.sh
@@
-14,12
+14,6
@@
PYTHON="rpm_build/bin/python"
$PYTHON -m pip install --upgrade pip
$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
$PYTHON -m pip install --upgrade pip
$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
-# If STREAM not passed, extract from job name (format: foo-job-name-<stream>)
-if [ -z "$STREAM" ]; then
- # shellcheck disable=SC1083
- STREAM=${{JOB_NAME##*-}}
-fi
-
# Convert stream to numeric ODL major version
if [ "$STREAM" == "carbon" ]; then
VERSION_MAJOR=6
# Convert stream to numeric ODL major version
if [ "$STREAM" == "carbon" ]; then
VERSION_MAJOR=6
@@
-47,8
+41,8
@@
elif [ "$SILO" == "releng" ]; then
# Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
mkdir -p "$UPLOAD_FILES_PATH"
# Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
mkdir -p "$UPLOAD_FILES_PATH"
-
mv
"/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
-
mv
"/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
+
cp
"/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
+
cp
"/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
else
echo "Unknown Jenkins silo: $SILO"
exit 1
else
echo "Unknown Jenkins silo: $SILO"
exit 1