From 9fe265d24c55caa4cc7f67cc65e3ee36cf35bd7d Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 19 Dec 2017 17:03:17 -0500 Subject: [PATCH] No longer run master branch through CI. The integration branch will be run through CI and then pushed to master with github status checks. --- .travis.yml | 1 - doc/xml/release.xml | 4 ++++ test/lib/pgBackRestTest/Common/CiTest.pm | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c895c0f85..d7c09d13e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ branches: only: - - master - integration - /-ci$/ diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 5fffea294..f7ab5c0ee 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -158,6 +158,10 @@

Add unit tests for the Manifest module.

+ +

No longer run master branch through CI. The integration branch will be run through CI and then pushed to master with github status checks.

+
+

Move restore test infrastructure to HostBackup.pm. Required to test restores on the backup server, a fairly common scenario. Improve the restore function to accept optional parameters rather than a long list of parameters. In passing, clean up extraneous use of strType and strComment variables.

diff --git a/test/lib/pgBackRestTest/Common/CiTest.pm b/test/lib/pgBackRestTest/Common/CiTest.pm index b6b916a09..d78cdae66 100644 --- a/test/lib/pgBackRestTest/Common/CiTest.pm +++ b/test/lib/pgBackRestTest/Common/CiTest.pm @@ -74,7 +74,6 @@ sub process my $strConfig = "branches:\n" . " only:\n" . - " - master\n" . " - integration\n" . " - /-ci\$/\n" . "\n" .