Merge pull request ceph#50339 from cbodley/wip-qa-rgw-reef-upgrade

alimaredia · web-flow · commit 02172304dddc · 2023-03-14T13:59:34.000-04:00
qa/rgw: add rgw/upgrade suite

Reviewed-by: Ali Maredia &lt;amaredia@redhat.com&gt;
diff --git a/qa/suites/rgw/upgrade/% b/qa/suites/rgw/upgrade/%
diff --git a/qa/suites/rgw/upgrade/.qa b/qa/suites/rgw/upgrade/.qa
@@ -0,0 +1 @@
+../.qa
diff --git a/qa/suites/rgw/upgrade/1-install/pacific.yaml b/qa/suites/rgw/upgrade/1-install/pacific.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ragweed:
+    default-branch: ceph-master # ceph-pacific doesn't have tox, but tests are the same
+
+tasks:
+- install:
+    branch: pacific
+    exclude_packages:
+      - ceph-volume
diff --git a/qa/suites/rgw/upgrade/1-install/quincy.yaml b/qa/suites/rgw/upgrade/1-install/quincy.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ragweed:
+    default-branch: ceph-master # ceph-quincy doesn't have tox, but tests are the same
+
+tasks:
+- install:
+    branch: quincy
diff --git a/qa/suites/rgw/upgrade/2-setup.yaml b/qa/suites/rgw/upgrade/2-setup.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph:
+- rgw: [client.0, client.1]
+- tox: [client.0, client.1]
+- print: "installing upgraded packages"
+- install.upgrade:
+    mon.a:
+    mon.b:
diff --git a/qa/suites/rgw/upgrade/3-upgrade-sequence/osds-then-rgws.yaml b/qa/suites/rgw/upgrade/3-upgrade-sequence/osds-then-rgws.yaml
@@ -0,0 +1,27 @@
+tasks:
+- print: "ragweed prepare before upgrade"
+- ragweed:
+    client.0:
+      stages: prepare
+- print: "restarting upgraded osds"
+- ceph.restart:
+    daemons: [osd.0, osd.2]
+- ceph.restart:
+    daemons: [osd.1, osd.3]
+- ceph.restart:
+    daemons: [osd.4, osd.6]
+- ceph.restart:
+    daemons: [osd.5, osd.7]
+- print: "ragweed check/prepare after osd upgrade"
+- ragweed:
+    client.0:
+      stages: check
+    client.1:
+      stages: prepare
+- print: "restarting upgraded rgw"
+- ceph.restart:
+    daemons: [rgw.*]
+- print: "ragweed check after rgw upgrade"
+- ragweed:
+    client.1:
+      stages: check
diff --git a/qa/suites/rgw/upgrade/3-upgrade-sequence/rgws-then-osds.yaml b/qa/suites/rgw/upgrade/3-upgrade-sequence/rgws-then-osds.yaml
@@ -0,0 +1,27 @@
+tasks:
+- print: "ragweed prepare before upgrade"
+- ragweed:
+    client.0:
+      stages: prepare
+- print: "restarting upgraded rgws"
+- ceph.restart:
+    daemons: [rgw.*]
+- print: "ragweed check/prepare after rgw upgrade"
+- ragweed:
+    client.0:
+      stages: check
+    client.1:
+      stages: prepare
+- print: "restarting upgraded osds"
+- ceph.restart:
+    daemons: [osd.0, osd.2]
+- ceph.restart:
+    daemons: [osd.1, osd.3]
+- ceph.restart:
+    daemons: [osd.4, osd.6]
+- ceph.restart:
+    daemons: [osd.5, osd.7]
+- print: "ragweed check after osd upgrade"
+- ragweed:
+    client.1:
+      stages: check
diff --git a/qa/suites/rgw/upgrade/cluster.yaml b/qa/suites/rgw/upgrade/cluster.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-2.yaml
diff --git a/qa/suites/rgw/upgrade/frontend b/qa/suites/rgw/upgrade/frontend
@@ -0,0 +1 @@
+.qa/rgw_frontend
diff --git a/qa/suites/rgw/upgrade/objectstore b/qa/suites/rgw/upgrade/objectstore
@@ -0,0 +1 @@
+.qa/objectstore_cephfs
diff --git a/qa/suites/rgw/upgrade/overrides.yaml b/qa/suites/rgw/upgrade/overrides.yaml
@@ -0,0 +1,20 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - overall HEALTH_
+      - \(MON_DOWN\)
+      - \(MGR_DOWN\)
+      - \(OSD_DOWN\)
+      - \(PG_AVAILABILITY\)
+      - \(PG_DEGRADED\)
+      - slow request
+      - failed to encode map
+    wait-for-scrub: false
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
+      osd:
+        osd min pg log entries: 1
+        osd max pg log entries: 2
+  ragweed:
+    rgw_server: client.0
diff --git a/qa/suites/rgw/upgrade/supported-random-distro$ b/qa/suites/rgw/upgrade/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
diff --git a/qa/tasks/ragweed.py b/qa/tasks/ragweed.py
@@ -43,6 +43,8 @@ def get_ragweed_branches(config, client_conf):
         else:
             return [branch]
 
+def get_ragweed_dir(testdir, client):
+    return '{}/ragweed.{}'.format(testdir, client)
 
 @contextlib.contextmanager
 def download(ctx, config):
@@ -57,13 +59,14 @@ def download(ctx, config):
     log.info('Downloading ragweed...')
     testdir = teuthology.get_testdir(ctx)
     for (client, cconf) in config.items():
+        ragweed_dir = get_ragweed_dir(testdir, client)
         ragweed_repo = ctx.config.get('ragweed_repo',
                                       teuth_config.ceph_git_base_url + 'ragweed.git')
         for branch in get_ragweed_branches(ctx.config, cconf):
             log.info("Using branch '%s' for ragweed", branch)
             try:
                 ctx.cluster.only(client).sh(
-                    script=f'git clone -b {branch} {ragweed_repo} {testdir}/ragweed')
+                    script=f'git clone -b {branch} {ragweed_repo} {ragweed_dir}')
                 break
             except Exception as e:
                 exc = e
@@ -74,7 +77,7 @@ def download(ctx, config):
         if sha1 is not None:
             ctx.cluster.only(client).run(
                 args=[
-                    'cd', '{tdir}/ragweed'.format(tdir=testdir),
+                    'cd', ragweed_dir,
                     run.Raw('&&'),
                     'git', 'reset', '--hard', sha1,
                     ],
@@ -83,14 +86,10 @@ def download(ctx, config):
         yield
     finally:
         log.info('Removing ragweed...')
-        testdir = teuthology.get_testdir(ctx)
         for client in config:
+            ragweed_dir = get_ragweed_dir(testdir, client)
             ctx.cluster.only(client).run(
-                args=[
-                    'rm',
-                    '-rf',
-                    '{tdir}/ragweed'.format(tdir=testdir),
-                    ],
+                args=['rm', '-rf', ragweed_dir]
                 )
 
 
@@ -218,7 +217,7 @@ def configure(ctx, config, run_stages):
             (remote,) = ctx.cluster.only(client).remotes.keys()
             remote.run(
                 args=[
-                    'rm',
+                    'rm', '-f',
                     '{tdir}/boto.cfg'.format(tdir=testdir),
                     ],
                 )
@@ -242,9 +241,10 @@ def run_tests(ctx, config, run_stages):
     testdir = teuthology.get_testdir(ctx)
     attrs = ["not fails_on_rgw"]
     for client, client_config in config.items():
+        ragweed_dir = get_ragweed_dir(testdir, client)
         stages = ','.join(run_stages[client])
         args = [
-            'cd', '{tdir}/ragweed'.format(tdir=testdir), run.Raw('&&'),
+            'cd', ragweed_dir, run.Raw('&&'),
             'RAGWEED_CONF={tdir}/archive/ragweed.{client}.conf'.format(tdir=testdir, client=client),
             'RAGWEED_STAGES={stages}'.format(stages=stages),
             'BOTO_CONFIG={tdir}/boto.cfg'.format(tdir=testdir),
