Update calls to pkg build scripts for 62023 CLI

Change-Id: I7744f3ec0743cb8ca29ff3741e2f3fb1bd812ce4
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/jjb/packaging/build-deb.sh b/jjb/packaging/build-deb.sh
index f3fe85248acd39eff42ccee298f8df57c93f6041..4ccffa201fdde4fac94c75eb21f59a087f34d803 100644 (file)
--- a/jjb/packaging/build-deb.sh
+++ b/jjb/packaging/build-deb.sh
@@ -15,9 +15,11 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Build release specified by build params
-"$WORKSPACE/packaging/packages/build.py" --deb --download_url "$DOWNLOAD_URL" \
+"$WORKSPACE/packaging/packages/build.py" --deb \
                                          --changelog_name "$CHANGELOG_NAME" \
-                                         --changelog_email "$CHANGELOG_EMAIL"
+                                         --changelog_email "$CHANGELOG_EMAIL" \
+                                         direct \
+                                         --download_url "$DOWNLOAD_URL"
 
 # Copy the debs to be upload
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index cd559d4622f3006b7e838b2760dfb1bd7a1ce398..ebecea802b8a61d68591de7e4f0112b7dc9dae7c 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -33,10 +33,11 @@ else
 fi
 
 # Build the latest snapshot matching the given major minor version
-"$WORKSPACE/packaging/packages/build.py" --rpm --build-latest-snap \
-                                         --major "$VERSION_MAJOR" \
+"$WORKSPACE/packaging/packages/build.py" --rpm \
                                          --changelog_name "$CHANGELOG_NAME" \
-                                         --changelog_email "$CHANGELOG_EMAIL"
+                                         --changelog_email "$CHANGELOG_EMAIL" \
+                                         latest_snap \
+                                         --major "$VERSION_MAJOR"
 
 # Copy the rpm to be upload
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"

diff --git a/jjb/packaging/build-rpm.sh b/jjb/packaging/build-rpm.sh
index 70f5e57a7d8aa961a84fc255584eba50bc0bfff6..4d411ff35003ad6813d12d8108a5e03e911afb57 100644 (file)
--- a/jjb/packaging/build-rpm.sh
+++ b/jjb/packaging/build-rpm.sh
@@ -30,9 +30,11 @@ if [[ $DOWNLOAD_URL = *.zip ]]; then
 fi
 
 # Build release specified by build params
-"$WORKSPACE/packaging/packages/build.py" --rpm --download_url "$DOWNLOAD_URL" \
+"$WORKSPACE/packaging/packages/build.py" --rpm \
                                          --changelog_name "$CHANGELOG_NAME" \
-                                         --changelog_email "$CHANGELOG_EMAIL"
+                                         --changelog_email "$CHANGELOG_EMAIL" \
+                                         direct \
+                                         --download_url "$DOWNLOAD_URL"
 
 # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"