Removes merge check from BB pipeline

PolyJIT · Nov 4, 2019 · a6ac17c · a6ac17c
1 parent 38522d8
commit a6ac17c
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 35 deletions.
diff --git a/polyjit/buildbot/builders/vara_feature_dev.py b/polyjit/buildbot/builders/vara_feature_dev.py
@@ -461,13 +461,6 @@ def configure(c):
                                              workdir=ip('%(prop:uchroot_image_path)s'),
                                              haltOnFailure=True, hideStepIf=True))
 
-    # Mergecheck
-    for repo in ['vara-llvm', 'vara-clang', 'vara']:
-        f.addStep(define('mergecheck_repo', repo))
-        f.addStep(GenerateMergecheckCommand(name="Dummy_5", command=['git', 'symbolic-ref', 'HEAD'],
-                                            workdir=ip(REPOS[repo]['checkout_dir']),
-                                            haltOnFailure=True, hideStepIf=True))
-
     c['builders'].append(builder(PROJECT_NAME, None, ACCEPTED_BUILDERS, tags=['vara'],
                                  factory=f))
 

diff --git a/polyjit/buildbot/builders/vara_feature_opt.py b/polyjit/buildbot/builders/vara_feature_opt.py
@@ -459,13 +459,6 @@ def configure(c):
                                              workdir=ip('%(prop:uchroot_image_path)s'),
                                              haltOnFailure=True, hideStepIf=True))
 
-    # Mergecheck
-    for repo in ['vara-llvm', 'vara-clang', 'vara']:
-        f.addStep(define('mergecheck_repo', repo))
-        f.addStep(GenerateMergecheckCommand(name="Dummy_5", command=['git', 'symbolic-ref', 'HEAD'],
-                                            workdir=ip(REPOS[repo]['checkout_dir']),
-                                            haltOnFailure=True, hideStepIf=True))
-
     c['builders'].append(builder(PROJECT_NAME, None, ACCEPTED_BUILDERS, tags=['vara'],
                                  factory=f))
 

diff --git a/polyjit/buildbot/builders/vara_master_dev.py b/polyjit/buildbot/builders/vara_master_dev.py
@@ -366,13 +366,6 @@ def configure(c):
                                              workdir=ip('%(prop:uchroot_image_path)s'),
                                              haltOnFailure=True, hideStepIf=True))
 
-    # Mergecheck
-    for repo in ['vara-llvm', 'vara-clang', 'vara']:
-        f.addStep(define('mergecheck_repo', repo))
-        f.addStep(GenerateMergecheckCommand(name="Dummy_5", command=['git', 'symbolic-ref', 'HEAD'],
-                                            workdir=ip(REPOS[repo]['checkout_dir']),
-                                            haltOnFailure=True, hideStepIf=True))
-
     c['builders'].append(builder(PROJECT_NAME, None, ACCEPTED_BUILDERS, tags=['vara'],
                                  factory=f))
 

diff --git a/polyjit/buildbot/builders/vara_master_opt.py b/polyjit/buildbot/builders/vara_master_opt.py
@@ -366,13 +366,6 @@ def configure(c):
                                              workdir=ip('%(prop:uchroot_image_path)s'),
                                              haltOnFailure=True, hideStepIf=True))
 
-    # Mergecheck
-    for repo in ['vara-llvm', 'vara-clang', 'vara']:
-        f.addStep(define('mergecheck_repo', repo))
-        f.addStep(GenerateMergecheckCommand(name="Dummy_5", command=['git', 'symbolic-ref', 'HEAD'],
-                                            workdir=ip(REPOS[repo]['checkout_dir']),
-                                            haltOnFailure=True, hideStepIf=True))
-
     c['builders'].append(builder(PROJECT_NAME, None, ACCEPTED_BUILDERS, tags=['vara'],
                                  factory=f))
 

diff --git a/polyjit/buildbot/builders/vara_phasar_master_dev.py b/polyjit/buildbot/builders/vara_phasar_master_dev.py
@@ -373,13 +373,6 @@ def configure(c):
     #                                         workdir=ip('%(prop:uchroot_image_path)s'),
     #                                         haltOnFailure=True, hideStepIf=True))
 
-    ## Mergecheck
-    #for repo in ['vara-llvm', 'vara-clang', 'vara']:
-    #    f.addStep(define('mergecheck_repo', repo))
-    #    f.addStep(GenerateMergecheckCommand(name="Dummy_5", command=['git', 'symbolic-ref', 'HEAD'],
-    #                                        workdir=ip(REPOS[repo]['checkout_dir']),
-    #                                        haltOnFailure=True, hideStepIf=True))
-
     c['builders'].append(builder(PROJECT_NAME, None, ACCEPTED_BUILDERS, tags=['vara'],
                                  factory=f))