From 320049426fa9e848108496ca7dc920b1bea681dd Mon Sep 17 00:00:00 2001
From: Thierry Escande <thierry.escande@huawei.com>
Date: Thu, 23 Jun 2022 13:16:46 +0200
Subject: [PATCH] CI: First fetch for openharmony v3.1.1
I don't have a valid explanation for that but it turns out that fetching
3.0 repositories first then 3.1.1 ones leads to bitbake fetch failures.
Starting by fetching 3.1.1 then 3.0 repositories works better.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35873c74..0ba1c1e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,7 +191,7 @@ fetch:
# there by .bitbake before_script but with an empty string.
- export DISTRO MACHINE
- for DISTRO in oniro-openharmony-linux ; do
- for OPENHARMONY_VERSION in 3.0 3.1 ; do
+ for OPENHARMONY_VERSION in 3.1 3.0 ; do
for MACHINE in qemuarma7 ; do
RECIPES="oniro-openharmony-bundle openharmony-standard-image openharmony-standard-image-tests" ;
echo Fetching DISTRO=$DISTRO OPENHARMONY_VERSION=$OPENHARMONY_VERSION MACHINE=$MACHINE RECIPE=$RECIPE ;
@@ -268,7 +268,7 @@ build:
parallel:
matrix:
- DISTRO: [oniro-openharmony-linux]
- OPENHARMONY_VERSION: ["3.0", "3.1"]
+ OPENHARMONY_VERSION: ["3.1", "3.0"]
MACHINE: [qemuarma7]
RECIPE: [oniro-openharmony-toolchain, oniro-openharmony-bundle, openharmony-standard-image]
artifacts:
@@ -294,7 +294,7 @@ ptest:
parallel:
matrix:
- DISTRO: [oniro-openharmony-linux]
- OPENHARMONY_VERSION: ["3.0", "3.1"]
+ OPENHARMONY_VERSION: ["3.1", "3.0"]
MACHINE: [qemuarma7]
RECIPE: [openharmony-standard-image-tests]
artifacts:
--
GitLab