Modified manifests for branch r/stx.6.0

Signed-off-by: Scott Little <scott.little@windriver.com>
Change-Id: I7dfa3302e4bdddc58bab52b31b03af9545a21643
This commit is contained in:
Scott Little 2021-12-09 11:57:29 -05:00
parent f25df10c33
commit ec2064a69b
6 changed files with 14 additions and 13 deletions

View File

@ -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-docs" 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>

View File

@ -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.6.0" remote="starlingx"/>
<include name="common.xml" />
<project remote="starlingx" name="compile.git" path="cgcs-root/stx/compile" />

View File

@ -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.6.0" remote="stx-staging"/>
<include name="common.xml" />
<project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>

View File

@ -3,6 +3,7 @@
<remote name="openstack" fetch="https://opendev.org/openstack" />
<remote name="starlingx" fetch="https://opendev.org/starlingx" />
<remote name="starlingx-docs" fetch="https://opendev.org/starlingx" />
<remote name="hpe-storage" fetch="https://github.com/hpe-storage" />
<remote name="gnocchi" fetch="https://github.com/gnocchixyz/" />
<remote name="linux-yocto" fetch="git://git.yoctoproject.org/" />
@ -12,7 +13,7 @@
<!-- for tests/experiments -->
<remote name="stx-staging" fetch="https://github.com/starlingx-staging"/>
<default revision="master" remote="stx-staging"/>
<default revision="r/stx.6.0" remote="stx-staging"/>
<project remote="starlingx" name="tools.git" path="stx-tools"/>
@ -28,7 +29,7 @@
<project remote="starlingx" name="containers.git" path="cgcs-root/stx/containers"/>
<project remote="starlingx" name="distcloud.git" path="cgcs-root/stx/distributedcloud"/>
<project remote="starlingx" name="distcloud-client.git" path="cgcs-root/stx/distributedcloud-client"/>
<project remote="starlingx" name="docs.git" path="cgcs-root/stx/docs"/>
<project remote="starlingx-docs" revision="master" name="docs.git" path="cgcs-root/stx/docs"/>
<project remote="starlingx" name="fault.git" path="cgcs-root/stx/fault"/>
<project remote="starlingx" name="gui.git" path="cgcs-root/stx/gui"/>
<project remote="starlingx" name="ha.git" path="cgcs-root/stx/ha"/>
@ -60,8 +61,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" name="stx-ryu.git" revision="e73cdeab37d4890138f9c48bf41cf08974ab2146" path="cgcs-root/stx/git/ryu"/>
<project remote="stx-staging" name="stx-openstack-ras.git" revision="4ba6047db1b70ee2bb3dd43739de7d2fb4e85ebd" 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"/>
@ -76,7 +77,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="7355fb2d7d3311f5962230a565574ce8c76c1caa" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
<!-- linux-yocto Upstream branch is v5.10/standard/base, commit 9e84a42af61ff9c6feb89ab8d61ee5f25fb35c72 is Merge tag 'v5.10.74' into v5.10/standard/base -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="9e84a42af61ff9c6feb89ab8d61ee5f25fb35c72" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>

View File

@ -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.6.0" remote="stx-staging"/>
<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" name="stx-ryu.git" revision="e73cdeab37d4890138f9c48bf41cf08974ab2146" path="cgcs-root/stx/git/ryu"/>
<project remote="stx-staging" name="stx-openstack-ras.git" revision="4ba6047db1b70ee2bb3dd43739de7d2fb4e85ebd" 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="7355fb2d7d3311f5962230a565574ce8c76c1caa" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
<!-- linux-yocto Upstream branch is v5.10/standard/base, commit 9e84a42af61ff9c6feb89ab8d61ee5f25fb35c72 is Merge tag 'v5.10.74' into v5.10/standard/base -->
<project remote="linux-yocto" sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="9e84a42af61ff9c6feb89ab8d61ee5f25fb35c72" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>

View File

@ -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.6.0" remote="starlingx"/>
<include name="common.xml" />
<project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>