diff options
author | Thomas Keller <thomas.keller@toradex.com> | 2023-04-04 14:07:14 +0200 |
---|---|---|
committer | Thomas Keller <thomas.keller@toradex.com> | 2023-04-12 14:14:47 +0200 |
commit | 9a4cd70dda2a54a7b8262bb5326e9750f3339b64 (patch) | |
tree | 7485cef2b46549b3336896db1536903f91cdd7f5 | |
parent | ccf96d6413d29cc0ef0c5320b847bb1affe8ba48 (diff) |
tester: cleanup manifest
- Unify abbreviation of Toradex
- Use tdx for all abbreviation of Toradex in the manifest files.
- Use new naming scheme of internal services and switch https.
- Reorder projects in all manifests
Signed-off-by: Thomas Keller <thomas.keller@toradex.com>
-rw-r--r-- | tester/default.xml | 12 | ||||
-rw-r--r-- | tester/integration.xml | 12 | ||||
-rw-r--r-- | tester/next.xml | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/tester/default.xml b/tester/default.xml index 49a8c13..c8fb2ec 100644 --- a/tester/default.xml +++ b/tester/default.xml @@ -6,18 +6,18 @@ <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> - <remote alias="repo" fetch="http://gitlab.toradex.int/rd/testing/som-fct" name="trdx-int"/> - - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="e62ecf20876ab9654498436ae8668b6300b8d18a" upstream="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> - </project> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="6bfe29d9e8fdd5c2fd17c736814b6df859b3af50" upstream="dunfell"/> <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="ff479c129366b7f67945e661472762ae6cb541f2" upstream="dunfell-5.x.y"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="a991a45459b7f3c0870ef94da6e48c279eaa97f0" upstream="dunfell-5.x.y"/> <project dest-branch="dunfell-5.x.y" name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="5967d772d686789e5ad95ab913870a9d1f8ff1a5" upstream="dunfell-5.x.y"/> - <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="trdx-int" revision="ec7c92c3728c6805e9b7de5abb257a2b3cca37ef" upstream="dunfell-5.x.y"> + <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="tdx-int" revision="e62ecf20876ab9654498436ae8668b6300b8d18a" upstream="dunfell-5.x.y"> + <copyfile dest="export" src="buildconf/export"/> + </project> + + <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="tdx-int" revision="ec7c92c3728c6805e9b7de5abb257a2b3cca37ef" upstream="dunfell-5.x.y"> <copyfile dest="export_control_image" src="buildconf/export"/> </project> </manifest> diff --git a/tester/integration.xml b/tester/integration.xml index a32114b..d72f2d2 100644 --- a/tester/integration.xml +++ b/tester/integration.xml @@ -6,18 +6,18 @@ <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> - <remote alias="repo" fetch="http://gitlab.toradex.int/rd/testing/som-fct" name="trdx-int"/> - - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> - </project> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="6bfe29d9e8fdd5c2fd17c736814b6df859b3af50" upstream="dunfell"/> <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="dunfell-5.x.y"/> - <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="trdx-int" revision="dunfell-5.x.y"> + <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export" src="buildconf/export"/> + </project> + + <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="tdx-int" revision="dunfell-5.x.y"> <copyfile dest="export_control_image" src="buildconf/export"/> </project> </manifest> diff --git a/tester/next.xml b/tester/next.xml index bb8a96b..3f02ec0 100644 --- a/tester/next.xml +++ b/tester/next.xml @@ -6,18 +6,18 @@ <remote alias="repo" fetch="https://github.com/meta-qt5" name="githq"/> <remote alias="repo" fetch="https://github.com/toradex" name="githt"/> - <remote alias="repo" fetch="http://gitlab.toradex.int/rd/testing/som-fct" name="trdx-int"/> - - <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="trdx-int" revision="dunfell-5.x.y"> - <copyfile dest="export" src="buildconf/export"/> - </project> + <remote alias="repo" fetch="https://gitlab.int.toradex.com/rd/testing/som-fct" name="tdx-int"/> <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="dunfell"/> <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="dunfell-5.x.y"/> <project name="meta-toradex-tezi.git" path="layers/meta-toradex-tezi" remote="githt" revision="dunfell-5.x.y"/> - <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="trdx-int" revision="dunfell-5.x.y"> + <project name="meta-toradex-tester.git" path="layers/meta-toradex-tester" remote="tdx-int" revision="dunfell-5.x.y"> + <copyfile dest="export" src="buildconf/export"/> + </project> + + <project name="meta-toradex-tester-control.git" path="layers/meta-toradex-tester-control" remote="tdx-int" revision="dunfell-5.x.y"> <copyfile dest="export_control_image" src="buildconf/export"/> </project> </manifest> |