Draft: .oniro-ci: support direct merge requests in .workspace job

The workspace job has special support for constructing a repo workspace with the changes from the incoming branch applied. This was developed with the GitLab CI option "merge results pipelines" 1 enabled. When that feature is off or unavailable, the git repository constructed by GitLab, as well as the environment variables are somewhat different.

Add logic to detect and work correctly in both cases.

Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@huawei.com

.oniro-ci/build-generic.yaml

@@ -16,6 +16,8 @@
     CI_ONIRO_GIT_REPO_PATH: ""
     CI_ONIRO_INSTANCE_SIZE: s3.large.8
   before_script:
+    # Mark the project directory, which is outside of $HOME, as safe.
+    - git config --global --add safe.directory "$CI_PROJECT_DIR"
     - test ! -e "$CI_PROJECT_DIR"/.scratch-dir-name || (
         echo "precondition failed - concurrent modification of $CI_PROJECT_DIR"
         && env | grep CI_ | sort
@@ -45,6 +47,15 @@
 
     # See the documentation of CI_ONIRO_GIT_REPO_PATH
     - |
+      echo "DEBUG: inspecting environment details"
+      env | grep -E ^CI_ | sort
+      (
+        cd $CI_PROJECT_DIR
+        git remote -v
+        git branch -a
+        git show
+      )
+      echo "DEBUG: ..."
       set -x
       if [ -n "$CI_ONIRO_GIT_REPO_PATH" ]; then
         if [ -n "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ]; then