Merge lp:~vila/uci-engine/stores-with-path into lp:uci-engine

[Vincent Ladeuil]

Allow data stores to use full paths

Allowing more than basename for artifacts became simpler since we removed 'cli' which was the only code relying on the data store to shorten the paths. The other users handle that themselves.

I've kept the BritneyDataStore as-is for now so we don't lose track of the associated FIXME.

This is a pre-requisite to store test runner artifacts under <package>/<arch> which is a pre-requisite for storing multiple test runs inside the same swift container and also needed for uci-britney.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:897
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1717/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1717/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vila/uci-engine/stores-with-path]

898. By Vincent Ladeuil on 2014-11-17

Fix pyflakes issue.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:898
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1718/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1718/rebuild

review: Approve (continuous-integration)

[Evan (ev)]

review: Needs Information

[Vincent Ladeuil (vila)]

> Why keep this at all?

From the cover letter: I've kept the BritneyDataStore as-is for now so we don't lose track of the associated FIXME.

And keep the MP small.

The BritneyDataStore will need to be revisited so I prefer to keep the existing references in place instead of replacing them with DataStore. They are equivalent right now but they are not used in the same way (the engine use a swift container for a single ticket, britney uses a swift container for all test results), so I expect this difference to be carried by BritneyDataStore when the time comes.

Unmerged revisions

898. By Vincent Ladeuil on 2014-11-17

Fix pyflakes issue.

897. By Vincent Ladeuil on 2014-11-17

Now that the 'cli' is gone, nobody requires artifact paths to be reduced to their basename. The corresponding tests are not required anymore either.

=== modified file 'britney_proxy/britney/process_results.py'
--- britney_proxy/britney/process_results.py	2014-10-30 17:30:49 +0000
+++ britney_proxy/britney/process_results.py	2014-11-17 16:13:58 +0000
@@ -51,11 +51,7 @@
 # container. This won't scale but we'll revisit the layout when we get a better
 # understanding of the britney needs (and numbers !) -- vila 2014-10-03
 class BritneyDataStore(data_store.DataStore):
-
-    def file_name(self, filename):
-        # Allow paths to be used as object names in the container by overriding
-        # the filtering in the base class.
-        return filename
+    pass
 
 
 class BritneyResultHandler(object):

=== modified file 'ci-utils/ci_utils/data_store.py'
--- ci-utils/ci_utils/data_store.py	2014-10-07 10:04:01 +0000
+++ ci-utils/ci_utils/data_store.py	2014-11-17 16:13:58 +0000
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import os
 
 from swiftclient import client
 from swiftclient.client import ClientException
@@ -162,7 +161,7 @@
         :param filename: The file name used to build the object name inside the
             container.
         """
-        return os.path.basename(filename)
+        return filename
 
     def file_path(self, filename):
         name = self.file_name(filename)

=== modified file 'ci-utils/ci_utils/tests/test_data_store.py'
--- ci-utils/ci_utils/tests/test_data_store.py	2014-10-07 10:04:01 +0000
+++ ci-utils/ci_utils/tests/test_data_store.py	2014-11-17 16:13:58 +0000
@@ -35,23 +35,5 @@
             data_store.DataStore.validate_auth_config({})
 
 
-class TestDataStoreFileName(unittest.TestCase):
-
-    def setUp(self):
-        super(TestDataStoreFileName, self).setUp()
-        # We won't use any method that requires the auth config so we don't
-        # provide any.
-        self.ds = data_store.DataStore('foo', None)
-
-    def test_abspath(self):
-        self.assertEquals('foo', self.ds.file_name('/baz/bar/foo'))
-
-    def test_relpath(self):
-        self.assertEquals('foo', self.ds.file_name('../baz/bar/foo'))
-
-    def test_basename(self):
-        self.assertEquals('foo', self.ds.file_name('foo'))
-
-
 if __name__ == "__main__":
     unittest.main()