Netconf CallHome Build File

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

diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
index 95a4497950383b28a3f65b67a57bcdb7f3b5b68f..e8fcab79adfc9b6dc12a9e15ebc793be496a12f6 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm.sh
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -8,18 +8,16 @@ 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
+pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+
+# Make a URL for the tarball artifact from DOWNLOAD_URL (a zip)
+# shellcheck disable=SC2154
+download_url="${{DOWNLOAD_URL//zip/tar.gz}}"
 
 # Build release specified by build params
-$WORKSPACE/packaging/rpm/build.py --major "$VERSION_MAJOR" \
-                                  --minor "$VERSION_MINOR" \
-                                  --patch "$VERSION_PATCH" \
-                                  --rpm "$RPM_RELEASE" \
-                                  --sysd_commit "$SYSD_COMMIT" \
-                                  --codename "$CODENAME" \
-                                  --download_url "$DOWNLOAD_URL" \
-                                  --changelog_date "$CHANGELOG_DATE" \
+"$WORKSPACE/packaging/rpm/build.py" --download_url "$download_url" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"