diff options
| -rw-r--r-- | .testseries | 1 | ||||
| -rw-r--r-- | tasks/rake/testbranch.rake | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/.testseries b/.testseries new file mode 100644 index 000000000..0d8969bb0 --- /dev/null +++ b/.testseries @@ -0,0 +1 @@ +tickets/master/2239 diff --git a/tasks/rake/testbranch.rake b/tasks/rake/testbranch.rake new file mode 100644 index 000000000..62304ea0e --- /dev/null +++ b/tasks/rake/testbranch.rake @@ -0,0 +1,16 @@ +desc "Rebuild the 'test' branch" +task :testbranch do + TEST_SERIES = %x{git config --get puppet.testseriesfile}.chomp + + sh 'git checkout master' + if %x{git branch}.split("\n").detect { |l| l =~ /\s+test$/ } + sh 'git branch -D test' + end + sh 'git checkout -b test' + File.readlines(TEST_SERIES).each do |line| + line.chomp! + + # Always create a commit for our merge + sh "git merge --no-ff #{line}" + end +end |