rebase master, update multistage test

Author: pmrowla

tests/func/test_repro_multistage.py

@@ -261,25 +261,27 @@ def test_downstream(tmp_dir, dvc):
 
     # B, C should be run (in any order) before D
     # See https://github.com/iterative/dvc/issues/3602
-    evaluation = dvc.reproduce("Dvcfile:A-gen", downstream=True, force=True)
+    evaluation = dvc.reproduce(
+        PIPELINE_FILE + ":A-gen", downstream=True, force=True
+    )
 
     assert len(evaluation) == 5
     assert (
         isinstance(evaluation[0], PipelineStage)
-        and evaluation[0].relpath == "Dvcfile"
+        and evaluation[0].relpath == PIPELINE_FILE
         and evaluation[0].name == "A-gen"
     )
     names = set()
     for stage in evaluation[1:3]:
         if isinstance(stage, PipelineStage):
-            assert stage.relpath == "Dvcfile"
+            assert stage.relpath == PIPELINE_FILE
             names.add(stage.name)
         else:
             names.add(stage.relpath)
     assert names == {"B-gen", "C.dvc"}
     assert (
         isinstance(evaluation[3], PipelineStage)
-        and evaluation[3].relpath == "Dvcfile"
+        and evaluation[3].relpath == PIPELINE_FILE
         and evaluation[3].name == "D-gen"
     )
     assert (