Build rpm & rpm-snap using refactored logic

This commit updates build-rpm and build-rpm-snap
jobs for the refactored logic.

Change-Id: I5b8ac54644620cc90f82a12219570cfd38c2d220
Signed-off-by: Alok Anand <alok4nand@gmail.com>

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index 7587d2a68e6a271b7fc868b5b78db7c6edb6191e..9ff3b41f7e7d6ea76d28767c796f484644e78e92 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -12,10 +12,10 @@ virtualenv rpm_build
 source rpm_build/bin/activate
 PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
-$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Build the latest snapshot matching the given major minor version
-"$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
+"$WORKSPACE/packaging/packages/build.py" --rpm --build-latest-snap \
                                   --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
                                   --changelog_name "$CHANGELOG_NAME" \

diff --git a/jjb/packaging/build-rpm.sh b/jjb/packaging/build-rpm.sh
index aeee81f5a85a581b57386c139e74a4eae57bf8b5..6c76fd958551fb5c262aab4de5769749f4b77927 100644 (file)
--- a/jjb/packaging/build-rpm.sh
+++ b/jjb/packaging/build-rpm.sh
@@ -12,14 +12,14 @@ virtualenv rpm_build
 source rpm_build/bin/activate
 PYTHON="rpm_build/bin/python"
 $PYTHON -m pip install --upgrade pip
-$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/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" --download_url "$download_url" \
+"$WORKSPACE/packaging/packages/build.py" --rpm --download_url "$download_url" \
                                     --changelog_name "$CHANGELOG_NAME" \
                                     --changelog_email "$CHANGELOG_EMAIL"