diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1021198e9be50c2057231827495329f585cfa90b..171cecd0c7558fc2556e59513bdecdb8bf6f6199 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,17 +57,21 @@ aggregate-docs: # automatically, giving an option to the developer, to start the desired jobs # manually. .workspace-rules: + variables: + CI_ONIRO_MAGIC: ".gitlab-ci.yml:61:.workspace-rules" rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' variables: CI_ONIRO_MANIFEST_URL: "$CI_PROJECT_URL" CI_ONIRO_MANIFEST_BRANCH: "$CI_COMMIT_REF_NAME" + CI_ONIRO_MAGIC: ".gitlab-ci.yml:67:.workspace-rules" - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^(wip|draft):.*/i' when: manual variables: # See below for rationale. CI_ONIRO_MANIFEST_URL: "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" CI_ONIRO_MANIFEST_BRANCH: "$CI_COMMIT_REF_NAME" + CI_ONIRO_MAGIC: ".gitlab-ci.yml:74:.workspace-rules" - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - assets/**/* @@ -83,6 +87,7 @@ aggregate-docs: variables: CI_ONIRO_MANIFEST_URL: "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" CI_ONIRO_MANIFEST_BRANCH: "$CI_COMMIT_REF_NAME" + CI_ONIRO_MAGIC: ".gitlab-ci.yml:90:.workspace-rules" - if: '$CI_COMMIT_TAG' # XXX: This needs CI_ONIRO_MANIFEST_BRANCH as well, most likely. @@ -102,9 +107,13 @@ aggregate-docs: # that replace the previous value. .bitbake-workspace: + variables: + CI_ONIRO_MAGIC: ".gitlab-ci.yml:111:.bitbake-workspace" extends: [.workspace, .workspace-rules] .build-rauc-bundle: + variables: + CI_ONIRO_MAGIC: ".gitlab-ci.yml:116:.build-rauc-bundle" extends: [.build-image, .workspace-rules] .publish-rauc-bundle-to-hawkbit: diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml index 8dbb59aca711ca044f870c4e4c6653dd96398614..7149b47f89dfcf3556fd4cac2d725b3d19b9354d 100644 --- a/.oniro-ci/build-generic.yaml +++ b/.oniro-ci/build-generic.yaml @@ -15,7 +15,9 @@ CI_ONIRO_MANIFEST_MIRROR: oniro-develop CI_ONIRO_GIT_REPO_PATH: "" CI_ONIRO_INSTANCE_SIZE: s3.large.8 + CI_ONIRO_MAGIC: ".oniro-ci/build-generic.yaml:18:.workspace" before_script: + - env | grep -E ^CI_ONIRO | sort - test ! -e "$CI_PROJECT_DIR"/.scratch-dir-name || ( echo "precondition failed - concurrent modification of $CI_PROJECT_DIR" && env | grep CI_ | sort @@ -91,6 +93,7 @@ CI_ONIRO_BB_LOCAL_CONF_plus_equals_USER_CLASSES: "buildstats buildstats-summary" CI_ONIRO_DEVTOOL_RECIPE_NAME: "" CI_ONIRO_DEVTOOL_LAYER_PATH: "" + CI_ONIRO_MAGIC: ".oniro-ci/build-generic.yaml:96:.bitbake-workspace" before_script: # Bitbake requires a non-root user to operate.