From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 1 Jun 2020 18:40:00 +0000 (-0700)
Subject: Merge branch 'octopus' of https://github.com/ceph/ceph into wip-yuriw-octopus-p2p... 
X-Git-Tag: v15.2.4~74^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce268c2a57af48691bb51d7771eb2def8ffb7bf7;p=ceph.git

Merge branch 'octopus' of https://github.com/ceph/ceph into wip-yuriw-octopus-p2p-octopus
Changed to v15.2.3

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

ce268c2a57af48691bb51d7771eb2def8ffb7bf7
diff --cc qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
index 1e38ebd24ea8,1bcca4e75aaa..165076b017b2
--- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
@@@ -3,7 -3,7 +3,7 @@@ meta
     Run ceph on two nodes, using one of them as a client,
     with a separate client-only node.
     Use xfs beneath the osds.
-    install ceph/octopus v15.2.2 and the v15.2.x point versions
 -   install ceph/octopus v15.2.1 point version
++   install ceph/octopus v15.2.3 and the v15.2.x point versions
     run workload and upgrade-sequence in parallel
     (every point release should be tested)
     run workload and upgrade-sequence in parallel
@@@ -83,17 -83,18 +83,17 @@@ tasks
  - print: "**** done workload v15.2.1"
  
  
- #######  upgrade to v15.2.2
 -#######  upgrade to v15.2.?? PLACEHOLDER
 -#- install.upgrade:
 -#    #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 -#    mon.a:
 -#      tag: v15.2.??
 -#    mon.b:
 -#      tag: v15.2.??
 -#    # Note that client.a IS NOT upgraded at this point
 -#- parallel:
 -#   - workload_octopus
 -#   - upgrade-sequence_octopus
 -#- print: "**** done parallel octopus v15.2.??"
++#######  upgrade to v15.2.3
 +- install.upgrade:
 +    #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 +    mon.a:
-       tag: v15.2.2
++      tag: v15.2.3
 +    mon.b:
-       tag: v15.2.2
++      tag: v15.2.3
 +- parallel:
 +   - workload_octopus
 +   - upgrade-sequence_octopus
- - print: "**** done parallel octopus v15.2.2"
++- print: "**** done parallel octopus v15.2.3"
  
  ####  upgrade to latest octopus
  - install.upgrade: