diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2018-04-09 16:16:28 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2018-04-09 16:52:17 +0200 |
commit | 3104fec337272bf9ada8e1c907b3af21af061e2a (patch) | |
tree | 3b0b989718583dcd0c7910f2cfdcd38427298ce0 | |
parent | a428ba2c3e7b7cb564fdecfcd7b2e6e6718a9e36 (diff) |
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 <mgradzki@cisco.com>
-rw-r--r-- | .gitreview | 1 | ||||
-rwxr-xr-x | packaging/rpm/release | 4 | ||||
-rw-r--r-- | release-notes/pom.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitreview b/.gitreview index 27843c657..bccfb7c64 100644 --- 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 c95b6ae8a..06865b905 100755 --- 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 393d5d88a..9b4866c86 100644 --- 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--> |