Merge pull request #2285 from coolo/fix_ci

Make the CI green again

dist/ci/docker-compose.yml

@@ -17,7 +17,7 @@ services:
     command: /usr/sbin/memcached -u memcached
   api:
     <<: *obs
-    command: chroot --userspec=wwwrun / /bin/bash -c "cd /srv/www/obs/api && /usr/bin/bundle exec rails s -e production"
+    command: chroot --userspec=wwwrun / /bin/bash -c "cd /srv/www/obs/api && RAILS_ENV=production rake ts:rebuild && /usr/bin/bundle exec rails s -e production"
     depends_on:
       - db
       - cache

tests/OBSLocal.py

@@ -142,7 +142,14 @@ class StagingWorkflow(object):
         THIS_DIR = os.path.dirname(os.path.abspath(__file__))
         oscrc = os.path.join(THIS_DIR, 'test.oscrc')
 
+        # set to None so we return the destructor early in case of exceptions
+        self.api = None
         self.apiurl = APIURL
+        self.project = project
+        self.projects = {}
+        self.requests = []
+        self.groups = []
+        self.users = []
         logging.basicConfig()
 
         # clear cache from other tests - otherwise the VCR is replayed depending
@@ -154,11 +161,7 @@ class StagingWorkflow(object):
                                  override_no_gnome_keyring=True)
         if os.environ.get('OSC_DEBUG'):
             osc.core.conf.config['debug'] = 1
-        self.project = project
-        self.projects = {}
-        self.requests = []
-        self.groups = []
-        self.users = []
+
         CacheManager.test = True
         # disable caching, the TTLs break any reproduciblity
         Cache.CACHE_DIR = None
@@ -291,6 +294,8 @@ class StagingWorkflow(object):
         return staging
 
     def __del__(self):
+        if not self.api:
+            return
         try:
             self.remove()
         except:

tests/fixtures/oscrc

@@ -103,4 +103,6 @@ pass=opensuse
 #keyring = 1
 
 [openSUSE:Factory]
+user=dummy
+pass=dummy
 overridden-by-local = local

tests/test.oscrc

@@ -7,5 +7,8 @@ user=Admin
 pass=opensuse
 
 [openSUSE:Factory]
+# https://github.com/openSUSE/osc/issues/667
+user=dummy
+pass=dummy
 overridden-by-local = local