Merge pull request #1956 from dscho/azure-pipelines-skip-rebase-p

dscho · web-flow · commit 112070208619 · 2018-11-28T16:35:27.000+01:00
Prepare for skipping `git rebase -p` tests on Azure Pipelines
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -215,8 +215,8 @@ phases:
          . ci/lib.sh
 
          make -j10 DEVELOPER=1 NO_PERL=1 || exit 1
-         NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_OPTS=\"--no-chain-lint --no-bin-wrappers --quiet --write-junit-xml\" time make -j15 -k DEVELOPER=1 test || {
-           NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_OPTS=\"-i -v -x\" make -k -C t failed; exit 1
+         NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"--no-chain-lint --no-bin-wrappers --quiet --write-junit-xml\" time make -j15 -k DEVELOPER=1 test || {
+           NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"-i -v -x\" make -k -C t failed; exit 1
          }
 
          save_good_tree

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,8 @@ phases:`
`215`	`215`	`. ci/lib.sh`
`216`	`216`
`217`	`217`	`make -j10 DEVELOPER=1 NO_PERL=1 \|\| exit 1`
`218`		`- NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_OPTS=\"--no-chain-lint --no-bin-wrappers --quiet --write-junit-xml\" time make -j15 -k DEVELOPER=1 test \|\| {`
`219`		`- NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_OPTS=\"-i -v -x\" make -k -C t failed; exit 1`
	`218`	`+ NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"--no-chain-lint --no-bin-wrappers --quiet --write-junit-xml\" time make -j15 -k DEVELOPER=1 test \|\| {`
	`219`	`+ NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"-i -v -x\" make -k -C t failed; exit 1`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`save_good_tree`