From 4747c3b12e95430afc07b1673524a9d991f25c54 Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Sat, 2 Sep 2017 18:59:46 -0400 Subject: [PATCH] Update calls to pkg build scripts for 62023 CLI Change-Id: I7744f3ec0743cb8ca29ff3741e2f3fb1bd812ce4 Signed-off-by: Daniel Farrell --- jjb/packaging/build-deb.sh | 6 ++++-- jjb/packaging/build-rpm-snap.sh | 7 ++++--- jjb/packaging/build-rpm.sh | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/jjb/packaging/build-deb.sh b/jjb/packaging/build-deb.sh index f3fe85248..4ccffa201 100644 --- 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 cd559d462..ebecea802 100644 --- 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 70f5e57a7..4d411ff35 100644 --- 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" -- 2.36.6