diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9123809b204..842b4beee52 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,7 +20,8 @@ Please include a short resume of the changes and what is the purpose of PR. Any - [ ] 2.8.x - [ ] 18.10.x - [ ] 19.04.x -- [ ] 19.10.x (master) +- [ ] 19.10.x +- [ ] 20.04.x (master)

How this pull request can be tested ?

@@ -42,4 +43,4 @@ Any **relevant details** of the configuration to perform the test should be adde - [ ] I have made sure that the **unit tests** related to the story are successful. - [ ] I have made sure that **unit tests cover 80%** of the code written for the story. -- [ ] I have made sure that **acceptance tests** related to the story are successful (**local and CI**) +- [ ] I have made sure that **acceptance tests** related to the story are successful (**local and CI**) diff --git a/Jenkinsfile b/Jenkinsfile index c1f7057373c..6d7652413b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ ** Variables. */ properties([buildDiscarder(logRotator(numToKeepStr: '50'))]) -def serie = '19.10' +def serie = '20.04' def maintenanceBranch = "${serie}.x" if (env.BRANCH_NAME.startsWith('release-')) { env.BUILD = 'RELEASE' diff --git a/doc/en/release_notes/centreon-20.04.rst b/doc/en/release_notes/centreon-20.04.rst new file mode 100644 index 00000000000..d4aef590741 --- /dev/null +++ b/doc/en/release_notes/centreon-20.04.rst @@ -0,0 +1,9 @@ +=========================== +Centreon Web 20.04.0-beta.1 +=========================== + +Enhancements +------------ + +Bug Fixes +--------- diff --git a/doc/en/release_notes/index.rst b/doc/en/release_notes/index.rst index 0d520a97ea7..6c846365d95 100644 --- a/doc/en/release_notes/index.rst +++ b/doc/en/release_notes/index.rst @@ -9,6 +9,7 @@ Please find here the releases notes of the last major versions : .. toctree:: :maxdepth: 1 + centreon-20.04.rst centreon-19.10.rst centreon-19.04.rst centreon-18.10.rst diff --git a/doc/fr/release_notes/centreon-20.04.rst b/doc/fr/release_notes/centreon-20.04.rst new file mode 100644 index 00000000000..d4aef590741 --- /dev/null +++ b/doc/fr/release_notes/centreon-20.04.rst @@ -0,0 +1,9 @@ +=========================== +Centreon Web 20.04.0-beta.1 +=========================== + +Enhancements +------------ + +Bug Fixes +--------- diff --git a/doc/fr/release_notes/index.rst b/doc/fr/release_notes/index.rst index 0d520a97ea7..6c846365d95 100644 --- a/doc/fr/release_notes/index.rst +++ b/doc/fr/release_notes/index.rst @@ -9,6 +9,7 @@ Please find here the releases notes of the last major versions : .. toctree:: :maxdepth: 1 + centreon-20.04.rst centreon-19.10.rst centreon-19.04.rst centreon-18.10.rst diff --git a/sonar-project.properties b/sonar-project.properties index cf9bcd3649a..1a32a797b95 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ -sonar.projectKey=centreon-web-19.10 -sonar.projectName=Centreon Web 19.10 +sonar.projectKey=centreon-web-20.04 +sonar.projectName=Centreon Web 20.04 sonar.sources=. sonar.php.tests.reportPath=ut.xml sonar.php.coverage.reportPaths=coverage.xml diff --git a/www/install/insertBaseConf.sql b/www/install/insertBaseConf.sql index 025487dfa37..49eb4cbecb3 100644 --- a/www/install/insertBaseConf.sql +++ b/www/install/insertBaseConf.sql @@ -2,7 +2,7 @@ -- Insert version -- -INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '19.10.2'); +INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '20.04.0-beta.1'); -- -- Contenu de la table `contact` diff --git a/www/install/php/Update-20.04.0-beta.1.php b/www/install/php/Update-20.04.0-beta.1.php new file mode 100644 index 00000000000..18ee41d1a2c --- /dev/null +++ b/www/install/php/Update-20.04.0-beta.1.php @@ -0,0 +1,19 @@ +