diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 11:05:35 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 11:08:24 +0100 |
| commit | 0c7caef96d2a3bf9e9175a74f096da2e7263225a (patch) | |
| tree | bde2f8714d63f361d747e9fe6b4260f93db52c60 /packaging/rpm | |
| parent | b13e648949b268a91be59e2b722f6e687342a918 (diff) | |
Set hc2vpp version back to 1.18.01-SNAPSHOT
Also sets honeycomb DEB/RPM package version to 1.18.01-RC2~$BUILD_NUMBER
Change-Id: I7d1916b9e464d957d55b620e746cf763c83943a8
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/honeycomb.spec | 6 | ||||
| -rwxr-xr-x | packaging/rpm/release | 4 | ||||
| -rwxr-xr-x | packaging/rpm/rpmbuild.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index bb90aad0b..3c4e7efde 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -17,7 +17,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-RC1-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip Source1: honeycomb.service Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group @@ -38,13 +38,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version}-RC1 +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}-RC1/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name # Create directory in build root for systemd .service file mkdir -p $RPM_BUILD_ROOT/%{_unitdir} # Copy Honeycomb's systemd .service file to correct dir in build root diff --git a/packaging/rpm/release b/packaging/rpm/release index dfc702439..2693fd0a9 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -11,8 +11,8 @@ # Stable versions # # echo RC1~$BUILD_NUMBER -echo RC1 -# echo RC2~$BUILD_NUMBER +# echo RC1 +echo RC2~$BUILD_NUMBER # echo RC2 # # Release snapshot (1.18.01~XXX, 1.18.01.1~XXX, ...) diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index cf76e67b3..8691b68b8 100755 --- a/packaging/rpm/rpmbuild.sh +++ b/packaging/rpm/rpmbuild.sh @@ -3,7 +3,7 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f $DIR) ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/ -ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.18.01-RC1-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.18.01-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ |