From 210c9ef456d47a9f96ac51c0ab4e9b1d422ccbd3 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Thu, 25 Mar 2021 13:57:52 +0100
Subject: [PATCH] gitlab-ci.yml: switch to default manifest
The manifest repository no longer contains distinct default.xml and
develop.xml manifest files. That role has been delegated to distinct git
branches.
Switch to the default manifest so that the deprecated compatibility
module which has the same effect, can be removed.
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.ostc-ci/gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.ostc-ci/gitlab-ci.yml b/.ostc-ci/gitlab-ci.yml
index 0247d0a2..f4885aa6 100644
--- a/.ostc-ci/gitlab-ci.yml
+++ b/.ostc-ci/gitlab-ci.yml
@@ -30,8 +30,8 @@ include:
- '.ostc-ci/build-generic.yaml'
# Include the set of build flavours.
- '.ostc-ci/build-flavours.yaml'
- # Include the set of templates and jobs that use develop.xml.
- - '.ostc-ci/develop-targets.yaml'
+ # Include the set of jobs using the default manifest.
+ - '.ostc-ci/default-targets.yaml'
dco:
extends: .dco
--
GitLab