From 684d2407e885abc410b17591ed34f1d303b3b1ba Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Mon, 13 Jul 2020 17:06:20 -0700
Subject: [PATCH] Manifest files: set default revision for the r/stx.4.0
 branches

Ensure that the default revision for starlingx branches is the
r/stx.4.0 branch

Lock down openstack-ras and ryu to commit hashes.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Change-Id: Id8f5e47cf43f4db88b5bad92e0c1640756344ea6
---
 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 d45361d..1ba739e 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.4.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 a428366..c518f05 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.4.0" remote="starlingx"/>
   <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 f907053..1098fb1 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" 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"  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"/>
 
   <!-- 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 0aeb7d1..987c356 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="master" remote="stx-staging"/>
+  <default revision="r/stx.4.0" remote="starlingx"/>
   <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" 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"  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"/>
 
   <!-- 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 beb4eb8..c69f70b 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.4.0" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>