Disable S3 default remote store on Ubuntu 18.04

Author: TimoWilken

alibuild_helpers/args.py

@@ -231,7 +231,7 @@ def finaliseArgs(args, parser, star):
     args.configDir = format(args.configDir, prefix="")
 
     # On selected platforms, caching is active by default
-    if args.architecture in ("slc7_x86-64", "ubuntu1804_x86-64") and not args.preferSystem:
+    if args.architecture == "slc7_x86-64" and not args.preferSystem:
       args.noSystem = True
       if not args.remoteStore:
         args.remoteStore = "https://s3.cern.ch/swift/v1/alibuild-repo"

tests/test_args.py

@@ -67,7 +67,7 @@ class FakeExit(Exception):
   ((), "build zlib --remote-store rsync://test.local/"                    , [("noSystem", True)]),
   ((), "build zlib --remote-store rsync://test.local/::rw"                , [("noSystem", True), ("remoteStore", "rsync://test.local/"), ("writeStore", "rsync://test.local/")]),
   ((), "build zlib --architecture slc7_x86-64"                            , [("noSystem", True), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
-  ((), "build zlib --architecture ubuntu1804_x86-64"                      , [("noSystem", True), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
+  ((), "build zlib --architecture ubuntu1804_x86-64"                      , [("noSystem", False), ("preferSystem", False), ("remoteStore", "")]),
   ((), "build zlib -a slc7_x86-64 --docker-image alisw/slc7-builder"      , [("docker", True), ("dockerImage", "alisw/slc7-builder")]),
   ((), "build zlib -a slc7_x86-64 --docker"                               , [("docker", True), ("dockerImage", "alisw/slc7-builder")]),
   ((), "build zlib --devel-prefix -a slc7_x86-64 --docker"                , [("docker", True), ("dockerImage", "alisw/slc7-builder"), ("develPrefix", "%s-slc7_x86-64" % os.path.basename(os.getcwd()))]),