gitlab: Using default software type in its test

See merge request !1372

software/gitlab/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance.cfg]
 filename = instance.cfg.in
-md5sum = 8fabec3053c6453a0a4078ba89592da7
+md5sum = 7fa9436be9a31bf4ee172951df2d9df4
 
 [watcher]
 _update_hash_filename_ = watcher.in

software/gitlab/instance.cfg.in

@@ -15,7 +15,6 @@ offline = true
 recipe = slapos.cookbook:switch-softwaretype
 gitlab = instance-gitlab.cfg:output
 gitlab-export = instance-gitlab-export.cfg:output
-gitlab-test = instance-gitlab-test.cfg:output
 RootSoftwareInstance = $${:gitlab}
 # TODO -import, -pull-backup
 

software/gitlab/test/test.py

@@ -44,7 +44,7 @@ class TestGitlab(SlapOSInstanceTestCase):
 
   @classmethod
   def getInstanceSoftwareType(cls):
-    return 'gitlab-test'
+    return 'gitlab'
 
   def setUp(self):
     self.backend_url = self.computer_partition.getConnectionParameterDict(