Introduce stable/1804 branch

This patch:

- updates <project-branch> in the release notes,
- sets stable/1804 as default branch for gitreview,
- updates RPM/DEB release to RC1~$BUILD_NUMBER

Change-Id: I2fa5a7be12bb35d0a2b4705e47ea37c961692ff7
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/.gitreview b/.gitreview
index 27843c6..bccfb7c 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=hc2vpp
+defaultbranch=stable/1804

diff --git a/packaging/rpm/release b/packaging/rpm/release
index c95b6ae..06865b9 100755 (executable)
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -6,11 +6,11 @@
 # by a certain margin. Necessary due to honeycomb - hc2vpp split.
 # Build_number counter was reset rewriting older packages
 #
-echo $(expr $BUILD_NUMBER + 2000)
+# echo $(expr $BUILD_NUMBER + 2000)
 #
 # Stable versions
 #
-# echo RC1~$BUILD_NUMBER
+echo RC1~$BUILD_NUMBER
 # echo RC1
 # echo RC2~$BUILD_NUMBER
 # echo RC2

diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 393d5d8..9b4866c 100644 (file)
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -109,7 +109,7 @@
                 <project-public-version>18.04</project-public-version>
                 <project-config-version>1-18-04</project-config-version>
                 <project-version-in-jira>11102</project-version-in-jira>
-                <project-branch>master</project-branch>
+                <project-branch>stable/1804</project-branch>
                 <project-odl-version>oxygen</project-odl-version>
                 <project-vpp-version>18.04</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->