From 75146ad60cabdfb9fcdd794de87ced86cccae4c7 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 26 Jul 2022 23:35:22 -0400
Subject: [PATCH] Modified layered manifests for branch r/stx.7.0

Signed-off-by: Scott Little <scott.little@windriver.com>
Change-Id: I1a6c4f93688f579b6f015308d481a3c36eff1224
---
 common.xml     | 2 +-
 compiler.xml   | 2 +-
 containers.xml | 2 +-
 distro.xml     | 8 ++++----
 flock.xml      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common.xml b/common.xml
index 30e39b6..9981f50 100644
--- a/common.xml
+++ b/common.xml
@@ -4,7 +4,7 @@
 
   <project remote="starlingx"  name="root.git" path="cgcs-root"/>
 
-  <project remote="starlingx"  name="docs.git" path="cgcs-root/stx/docs"/>
+  <project remote="starlingx"  revision="master" name="docs.git" path="cgcs-root/stx/docs"/>
   <project remote="starlingx"  name="test.git" path="cgcs-root/stx/test"/>
   <project remote="starlingx"  name="zuul-jobs.git" path="cgcs-root/stx/zuul-jobs"/>
 </manifest>
diff --git a/compiler.xml b/compiler.xml
index d45361d..23d31b5 100644
--- a/compiler.xml
+++ b/compiler.xml
@@ -5,7 +5,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="starlingx"/>
+  <default revision="r/stx.7.0" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="compile.git" path="cgcs-root/stx/compile" />
diff --git a/containers.xml b/containers.xml
index accfb75..11b3b15 100644
--- a/containers.xml
+++ b/containers.xml
@@ -9,7 +9,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
   
-  <default revision="master" remote="stx-staging"/>
+  <default revision="r/stx.7.0" remote="starlingx"/>
   <include name="common.xml" />
   
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>
diff --git a/distro.xml b/distro.xml
index c538866..d7e7b2f 100644
--- a/distro.xml
+++ b/distro.xml
@@ -10,7 +10,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="stx-staging"/>
+  <default revision="r/stx.7.0" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ" />
@@ -20,8 +20,8 @@
   <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v14.2.22" path="cgcs-root/stx/git/ceph"/>
   <project remote="stx-staging"  name="stx-libvirt.git" revision="stx/v4.7.0-1" path="cgcs-root/stx/git/libvirt"/>
   <project remote="stx-staging"  name="stx-qemu.git" revision="stx/v3.0.0-1" path="cgcs-root/stx/git/qemu"/>
-  <project remote="stx-staging"  name="stx-ryu.git" path="cgcs-root/stx/git/ryu"/>
-  <project remote="stx-staging"  name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
+  <project remote="stx-staging"  revision="e73cdeab37d4890138f9c48bf41cf08974ab2146" name="stx-ryu.git" path="cgcs-root/stx/git/ryu"/>
+  <project remote="stx-staging"  revision="4ba6047db1b70ee2bb3dd43739de7d2fb4e85ebd" name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
 
   <!-- Clients -->
   <project remote="openstack"  revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>
@@ -36,7 +36,7 @@
   <project remote="openstack"  revision="stable/train" name="python-openstackclient.git" path="cgcs-root/stx/git/python-openstackclient"/>
   <project remote="openstack"  revision="stable/train" name="openstacksdk.git" path="cgcs-root/stx/git/python-openstacksdk"/>
   <project remote="openstack"  revision="stable/train" name="python-pankoclient.git" path="cgcs-root/stx/git/python-pankoclient"/>
-  <project remote="gnocchi"    revision="master" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
+  <project remote="gnocchi"    revision="000aad5e6bf07b842d5abb8b81c38fdc54a01637" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
 
   <!-- linux-yocto Upstream branch is v5.10/standard/base, commit 6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15 is Merge tag 'v5.10.112' into v5.10/standard/base -->
   <project remote="linux-yocto"    sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
diff --git a/flock.xml b/flock.xml
index b2819d0..0b71549 100644
--- a/flock.xml
+++ b/flock.xml
@@ -5,7 +5,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="starlingx"/>
+  <default revision="r/stx.7.0" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>