From 074a0d320904a38f31293e7b6e58c0d0bcb40ec7 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 14 Jul 2020 12:06:31 -0700
Subject: [PATCH] Revert "Manifest files: set default revision for the
 r/stx.4.0 branches"

This was not intended for master. Revert and this should be merged to r/stx4.0.

This reverts commit 630c167eb511a0b9cd70cb1e0bd46fdeefffb3b8.

Change-Id: I1599c2e5b9c5e39151bbbae6ad12665b81121dad
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 compiler.xml   | 2 +-
 containers.xml | 2 +-
 default.xml    | 6 +++---
 distro.xml     | 6 +++---
 flock.xml      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler.xml b/compiler.xml
index 1ba739e..d45361d 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="r/stx.4.0" remote="starlingx"/>
+  <default revision="master" 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 c518f05..a428366 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="r/stx.4.0" remote="starlingx"/>
+  <default revision="master" remote="stx-staging"/>
   <include name="common.xml" />
   
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>
diff --git a/default.xml b/default.xml
index 1098fb1..f907053 100644
--- a/default.xml
+++ b/default.xml
@@ -9,9 +9,9 @@
   <!-- for tests/experiments -->
 
   <remote name="stx-staging" fetch="https://github.com/starlingx-staging"/>
+  <default revision="master" remote="stx-staging"/>
 
   <project remote="starlingx"  name="tools.git" path="stx-tools"/>
-  <default revision="r/stx.4.0" remote="starlingx"/>
 
   <project remote="starlingx"  name="root.git" path="cgcs-root"/>
 
@@ -50,8 +50,8 @@
   <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v13.2.2"  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" revision="e73cdeab37d4890138f9c48bf41cf08974ab2146" path="cgcs-root/stx/git/ryu"/>
-  <project remote="stx-staging"  name="stx-openstack-ras.git" revision="cc6f677570b4f0e7ba44a91d5dff33164b8b76bc" path="cgcs-root/stx/git/openstack-ras"/>
+  <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"/>
 
   <!-- Clients -->
   <project remote="openstack"  revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>
diff --git a/distro.xml b/distro.xml
index 987c356..0aeb7d1 100644
--- a/distro.xml
+++ b/distro.xml
@@ -9,7 +9,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="r/stx.4.0" remote="starlingx"/>
+  <default revision="master" remote="stx-staging"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ" />
@@ -19,8 +19,8 @@
   <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v13.2.2" 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" revision="e73cdeab37d4890138f9c48bf41cf08974ab2146" path="cgcs-root/stx/git/ryu"/>
-  <project remote="stx-staging"  name="stx-openstack-ras.git" revision="cc6f677570b4f0e7ba44a91d5dff33164b8b76bc" path="cgcs-root/stx/git/openstack-ras"/>
+  <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"/>
 
   <!-- Clients -->
   <project remote="openstack"  revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>
diff --git a/flock.xml b/flock.xml
index c69f70b..beb4eb8 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="r/stx.4.0" remote="starlingx"/>
+  <default revision="master" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>