starlingx/manifest
Code Issues Proposed changes

Revert "Manifest files: set default revision for the r/stx.4.0 branches"

Browse Source 
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>
This commit is contained in:
Saul Wold 2020-07-14 12:06:31 -07:00
parent 630c167eb5
commit 074a0d3209
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler.xml
View File

@ -5,7 +5,7 @@
<!-- note, you can also provide personal overrides for your own github --> <!-- note, you can also provide personal overrides for your own github -->
<!-- for tests/experiments --> <!-- for tests/experiments -->
<default revision="r/stx.4.0" remote="starlingx"/> <default revision="master" remote="starlingx"/>
<include name="common.xml" /> <include name="common.xml" />
<project remote="starlingx" name="compile.git" path="cgcs-root/stx/compile" /> <project remote="starlingx" name="compile.git" path="cgcs-root/stx/compile" />

2
containers.xml
View File

@ -9,7 +9,7 @@
<!-- note, you can also provide personal overrides for your own github --> <!-- note, you can also provide personal overrides for your own github -->
<!-- for tests/experiments --> <!-- for tests/experiments -->
<default revision="r/stx.4.0" remote="starlingx"/> <default revision="master" remote="stx-staging"/>
<include name="common.xml" /> <include name="common.xml" />
<project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/> <project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>

6
default.xml
View File

@ -9,9 +9,9 @@
<!-- for tests/experiments --> <!-- for tests/experiments -->
<remote name="stx-staging" fetch="https://github.com/starlingx-staging"/> <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"/> <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"/> <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-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-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-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-ryu.git" 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-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
<!-- Clients --> <!-- Clients -->
<project remote="openstack" revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/> <project remote="openstack" revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>

6
distro.xml
View File

@ -9,7 +9,7 @@
<!-- note, you can also provide personal overrides for your own github --> <!-- note, you can also provide personal overrides for your own github -->
<!-- for tests/experiments --> <!-- for tests/experiments -->
<default revision="r/stx.4.0" remote="starlingx"/> <default revision="master" remote="stx-staging"/>
<include name="common.xml" /> <include name="common.xml" />
<project remote="starlingx" name="integ.git" path="cgcs-root/stx/integ" /> <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-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-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-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-ryu.git" 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-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
<!-- Clients --> <!-- Clients -->
<project remote="openstack" revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/> <project remote="openstack" revision="stable/train" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>

2
flock.xml
View File

@ -5,7 +5,7 @@
<!-- note, you can also provide personal overrides for your own github --> <!-- note, you can also provide personal overrides for your own github -->
<!-- for tests/experiments --> <!-- for tests/experiments -->
<default revision="r/stx.4.0" remote="starlingx"/> <default revision="master" remote="starlingx"/>
<include name="common.xml" /> <include name="common.xml" />
<project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/> <project remote="starlingx" name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>