Merge branch 'nuts_pipeline' into 'kirkstone'

oniro-ci: Add variable to specify oe-core path

See merge request eclipse/oniro-core/oniro!224

.oniro-ci/build-generic.yaml

@@ -15,6 +15,9 @@
     CI_ONIRO_MANIFEST_MIRROR: oniro-develop
     CI_ONIRO_GIT_REPO_PATH: ""
     CI_ONIRO_INSTANCE_SIZE: s3.large.8
+    # For testing with bleeding edge Yocto.
+    CI_ONIRO_OECORE_REPO: ""
+    CI_ONIRO_OECORE_BRANCH: ""
   before_script:
     - test ! -e "$CI_PROJECT_DIR"/.scratch-dir-name || (
         echo "precondition failed - concurrent modification of $CI_PROJECT_DIR"
@@ -56,6 +59,20 @@
       fi
       set +x
 
+    - |
+      set -x
+      if [ -n "$CI_ONIRO_OECORE_BRANCH" ]; then
+          if [ -n "$CI_ONIRO_OECORE_REPO" ]; then
+              echo "CI: Using oe-core from '$CI_ONIRO_OECORE_REPO': '$CI_ONIRO_OECORE_BRANCH'"
+              ( cd oe-core && git remote add oecore-nut "$CI_ONIRO_OECORE_REPO" \
+                  && git fetch oecore-nut && git checkout oecore-nut/"$CI_ONIRO_OECORE_BRANCH" )
+          else
+              echo "CI: Using oe-core branch: '$CI_ONIRO_OECORE_BRANCH'"
+              ( cd oe-core && git fetch && git checkout "$CI_ONIRO_OECORE_BRANCH" )
+          fi
+      fi
+      set +x
+
   script:
     # Reload the value of SCRATCH_DIR set in the before_script phase. Those run
     # in separate shell processes and do not share environment variables.

docs/ci/hidden-jobs/workspace.rst

@@ -108,6 +108,20 @@ Merge Results`_ for more information.
 
 The default value is the empty string.
 
+
+CI_ONIRO_OECORE_BRANCH
+----------------------
+
+Can be used to specify Openembedded Core branch to be used for testing.
+If not specified, the one defined in ``CI_ONIRO_MANIFEST_NAME`` manifest file will be used
+
+CI_ONIRO_OECORE_REPO
+--------------------
+
+Can be used to specify Openembedded Core repo (remote) to be used for testing.
+If not specified, the one defined in ``CI_ONIRO_MANIFEST_NAME`` manifest file will be used
+NOTE: ``CI_ONIRO_OECORE_BRANCH`` *must* be specified for overriden repos
+
 Local git-repo Mirror
 =====================