Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

25 files changed, 110 insertions, 0 deletions

diff --git a/qa/suites/rgw/upgrade/% b/qa/suites/rgw/upgrade/%
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/qa/suites/rgw/upgrade/%
diff --git a/qa/suites/rgw/upgrade/.qa b/qa/suites/rgw/upgrade/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/.qa b/qa/suites/rgw/upgrade/1-install/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/% b/qa/suites/rgw/upgrade/1-install/pacific/%
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/%
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/.qa b/qa/suites/rgw/upgrade/1-install/pacific/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa b/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml
new file mode 120000
index 000000000..5dceec7e2
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml
new file mode 120000
index 000000000..29fb99ae2
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_20.04.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/install.yaml b/qa/suites/rgw/upgrade/1-install/pacific/install.yaml
new file mode 100644
index 000000000..ec89e7921
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/install.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: pacific
+    exclude_packages:
+      - ceph-volume
diff --git a/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml
new file mode 100644
index 000000000..d882523e0
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ragweed:
+    default-branch: ceph-reef # ceph-pacific doesn't have tox, but tests are the same
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/% b/qa/suites/rgw/upgrade/1-install/quincy/%
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/%
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/.qa b/qa/suites/rgw/upgrade/1-install/quincy/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa b/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml
new file mode 120000
index 000000000..bd9854e70
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
new file mode 120000
index 000000000..29fb99ae2
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_20.04.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/install.yaml b/qa/suites/rgw/upgrade/1-install/quincy/install.yaml
new file mode 100644
index 000000000..a96f09ee7
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/install.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+    branch: quincy
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml
new file mode 100644
index 000000000..02508d329
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ragweed:
+    default-branch: ceph-reef # ceph-quincy doesn't have tox, but tests are the same
diff --git a/qa/suites/rgw/upgrade/2-setup.yaml b/qa/suites/rgw/upgrade/2-setup.yaml
new file mode 100644
index 000000000..f6627398e
--- /dev/null
+++ 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
new file mode 100644
index 000000000..22bfbc3d2
--- /dev/null
+++ 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
new file mode 100644
index 000000000..662750bee
--- /dev/null
+++ 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
new file mode 120000
index 000000000..230ff0fda
--- /dev/null
+++ b/qa/suites/rgw/upgrade/cluster.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-2.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/frontend b/qa/suites/rgw/upgrade/frontend
new file mode 120000
index 000000000..926a53e83
--- /dev/null
+++ b/qa/suites/rgw/upgrade/frontend
@@ -0,0 +1 @@
+.qa/rgw_frontend
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/ignore-pg-availability.yaml b/qa/suites/rgw/upgrade/ignore-pg-availability.yaml
new file mode 120000
index 000000000..32340b1fa
--- /dev/null
+++ b/qa/suites/rgw/upgrade/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+.qa/rgw/ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/objectstore b/qa/suites/rgw/upgrade/objectstore
new file mode 120000
index 000000000..f81d17413
--- /dev/null
+++ b/qa/suites/rgw/upgrade/objectstore
@@ -0,0 +1 @@
+.qa/objectstore_cephfs
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/overrides.yaml b/qa/suites/rgw/upgrade/overrides.yaml
new file mode 100644
index 000000000..00592d459
--- /dev/null
+++ 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