diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-01-04 20:18:25 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-01-24 13:13:59 +0100 |
| commit | 9813b4e4047e1226198bf215d89417a2dfc7f664 (patch) | |
| tree | 7160aab34c664b78da38d63745cc4c0c5b532be3 /packaging/rpm | |
| parent | 153c2954d71c94816dc604ba0fbb5ab7cf7c4205 (diff) | |
Bump hc2vpp version to 1.17.01-RC21.17.01-RC2
Also updates honeycomb dependencies to 1.17.01-RC2
Expected results after change submission:
1) all hc2vpp jars are uploaded to
https://nexus.fd.io/content/repositories/fd.io.release/io/fd/hc2vpp/
with 1.17.01-RC2 version set
2) honeycomb-1.17.01-RC2.noarch.rpm (outcome of hc2vpp-integration-1701-centos7)
is uploaded to
https://nexus.fd.io/content/repositories/fd.io.stable.1701.centos7/
io/fd/hc2vpp/honeycomb/1.17.01-RC2.noarch/
3) honeycomb-1.17.01-RC2_all-deb.deb (outcome of hc2vpp-integration-1701-ubuntu1404)
is uploaded to
https://nexus.fd.io/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/
io/fd/hc2vpp/honeycomb/1.17.01-RC2_all/
4) honeycomb-1.17.01-RC2_all-deb.deb (outcome of hc2vpp-integration-1701-ubuntu1604)
is uploaded to
https://nexus.fd.io/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/
io/fd/hc2vpp/honeycomb/1.17.01-RC2_all/
Change-Id: I2e281234d142535d740649e966e6b08f8398905b
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 | 7 | ||||
| -rwxr-xr-x | packaging/rpm/rpmbuild.sh | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index f702904dd..ee21b164f 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -16,7 +16,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip +Source0: vpp-integration-distribution-%{_version}-RC2-hc.zip Source1: honeycomb.service Requires: vpp >= 17.01, vpp < 17.04, vpp-plugins >= 17.01, vpp-plugins < 17.04, java >= 1:1.8.0 # Required for creating honeycomb group @@ -37,13 +37,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT +%autosetup -n vpp-integration-distribution-%{_version}-RC2 %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}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-RC2/* $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 751ee04f2..6d685d2d4 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,5 +1,10 @@ #!/bin/bash +# release version +echo RC2 +# +# snapshot version +# # Increasing the build number by a certain margin. # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset # rewriting older packages -echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file +# echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 2607d4c11..82fc1ab92 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.17.01-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.01-RC2-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ |