suite: drop -d/-D

diff --git a/scripts/suite.py b/scripts/suite.py
index 4ac7d9cac53d5f3bdbe97f73702c5633839399e5..63e16e32af071cd02b0e1c3117a6a6148cb19878 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -63,10 +63,6 @@ Standard arguments:
                               files respectively, otherwise use `main`.
   -m <type>, --machine-type <type>
                               Machine type [default: {default_machine_type}]
-  -d <distro>, --distro <distro>
-                              Distribution to run against
-  -D <distroversion>, --distro-version <distroversion>
-                              Distro version to run against
   --ceph-repo <ceph_repo>     Query this repository for Ceph branch and SHA1
                               values [default: {default_ceph_repo}]
   --suite-repo <suite_repo>   Use tasks and suite definition in this repository

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 9aece1271d0b8b80cd628220c34f11a74368642b..c58b9c371de30d958187b55d87b5394cbf67ae4f 100644 (file)
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -880,7 +880,7 @@ class ShamanProject(GitbuilderProject):
         req_obj['project'] = self.project
         req_obj['flavor'] = flavor
         arch = "noarch" if self.force_noarch else self.arch
-        req_obj['distros'] = '%s/%s' % (self.distro, arch)
+        # req_obj['distros'] = '%s/%s' % (self.distro, arch)
         ref_name, ref_val = list(self._choose_reference().items())[0]
         if ref_name == 'tag':
             req_obj['sha1'] = self._sha1 = self._tag_to_sha1()

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index b69b80b58efd424222acf0addd86e65ede42e571..4fd73651383e0b417e82bd5cf4634ca4a5b83606 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -102,9 +102,6 @@ class Run(object):
         teuthology_branch, teuthology_sha1 = self.choose_teuthology_branch()
 
 
-        if self.args.distro_version:
-            self.args.distro_version, _ = \
-                OS.version_codename(self.args.distro, self.args.distro_version)
         self.config_input = dict(
             suite=self.args.suite,
             suite_branch=suite_branch,
@@ -126,13 +123,8 @@ class Run(object):
         return self.build_base_config()
 
     def choose_os(self):
-        os_type = self.args.distro
-        os_version = self.args.distro_version
-        if not (os_type and os_version):
-            os_ = util.get_distro_defaults(
-                self.args.distro, self.args.machine_type)[2]
-        else:
-            os_ = OS(os_type, os_version)
+        os_ = util.get_distro_defaults(
+            None, self.args.machine_type)[2]
         return os_
 
     def choose_kernel(self):
@@ -146,8 +138,8 @@ class Run(object):
         else:
             kernel_hash = util.get_gitbuilder_hash(
                 'kernel', self.args.kernel_branch, 'default',
-                self.args.machine_type, self.args.distro,
-                self.args.distro_version,
+                self.args.machine_type, None,
+                None,
             )
             if not kernel_hash:
                 util.schedule_fail(
@@ -203,11 +195,11 @@ class Run(object):
             # don't bother if newest; we'll search for an older one
             # Get the ceph package version
             ceph_version = util.package_version_for_hash(
-                ceph_hash, self.args.flavor, self.os.name,
-                self.os.version, self.args.machine_type,
+                ceph_hash, self.args.flavor, None,
+                None, self.args.machine_type,
             )
             if not ceph_version:
-                msg = f"Packages for os_type '{self.os.name}', flavor " \
+                msg = f"Packages for flavor " \
                     f"{self.args.flavor} and ceph hash '{ceph_hash}' not found"
                 util.schedule_fail(msg, self.name, dry_run=self.args.dry_run)
             log.info("ceph version: {ver}".format(ver=ceph_version))