From 503b23ae58b5e5a76c42c079a8a33959767a562a Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Wed, 8 Jun 2022 14:08:10 +0800
Subject: [PATCH] .oniro-ci: use the same rule for rauc-bundle build and
publish jobs
In `.gitlab-ci.yml`, rauc-bundle build and publish jobs all extends
`workspace-rules`, and the latter job needs the former job. This is
good.
However, with the rules defined on the upstream job
'.publish-rauc-bundle-to-hawkbit', gitlab always try to add rauc-bundle publish
jobs into pipeline, when the build jobs are not added, error occurs.
Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
.oniro-ci/build-generic.yaml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 8dbb59ac..298fb396 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -391,15 +391,6 @@
- hawkbitctl upload
-m "$CI_ONIRO_HAWKBIT_SWMOD_NAME:$BUNDLE_VERSION"
-a "${CI_PROJECT_DIR}/artifacts/images/${MACHINE}/$(readlink "${CI_PROJECT_DIR}/artifacts/images/${MACHINE}/${CI_ONIRO_RAUC_BUNDLE_NAME}-${MACHINE}.raucb")"
- rules:
- # Publishing is done only for scheduled builds
- - if: '$CI_PIPELINE_SOURCE == "schedule"'
- # Run the job when a tag is placed.
- - if: '$CI_COMMIT_TAG'
- # For merge requests, the publishing is optional and can be triggered manually.
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: manual
- allow_failure: true
.build-zephyr-image:
extends: .build-image
--
GitLab