From 20eb5ab6109ff829fb6b061dbdc9f2cc2a92408f Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Mon, 6 Jun 2022 10:57:47 +0200
Subject: [PATCH] .gitlab-ci.yml: swap order of extends entries

Previous patch shows that the CI_ONIRO_MAGIC variable, when seen from
the linux-qemu-x86 job, has the value
".oniro-ci/build-generic.yaml:96:.bitbake-workspace". This implies that
the rule-specific variable defined in .gitlab-ci.yml, the
.workspace-rules job, was ignored.

Swap the order of entries in the extends declaration, to see if this has
any effect.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3ab6c72..1bafcfc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,10 +107,10 @@ aggregate-docs:
 # that replace the previous value.
 
 .bitbake-workspace:
-  extends: [.workspace, .workspace-rules]
+  extends: [.workspace-rules, .workspace]
 
 .build-rauc-bundle:
-  extends: [.build-image, .workspace-rules]
+  extends: [.workspace-rules, .build-image]
 
 .publish-rauc-bundle-to-hawkbit:
   extends: [.workspace-rules]
-- 
GitLab