Simplify autorelease to not use release tags

[releng/builder.git] / jjb / packaging / include-raw-build-rpm-snap.sh

diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/include-raw-build-rpm-snap.sh
index 0a2a6ddf69bf03cb6479f5267b4e5065133f3ea5..7587d2a68e6a271b7fc868b5b78db7c6edb6191e 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm-snap.sh
+++ b/jjb/packaging/include-raw-build-rpm-snap.sh
@@ -8,14 +8,21 @@ set -ex -o pipefail
 
 # Install required packages
 virtualenv rpm_build
+# shellcheck disable=SC1091
 source rpm_build/bin/activate
-pip install --upgrade pip
-pip install -r $WORKSPACE/packaging/rpm/requirements.txt
+PYTHON="rpm_build/bin/python"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 
 # Build the latest snapshot matching the given major minor version
-$WORKSPACE/packaging/rpm/build.py --build-latest-snap \
+"$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
                                   --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
-                                  --sysd_commit "$SYSD_COMMIT" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"
+
+# Copy the rpm to be upload
+UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
+mkdir -p "$UPLOAD_FILES_PATH"
+mv "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
+mv "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"