1 files changed, 15 insertions, 13 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a17ea9..2fade39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,24 +4,21 @@ stages:
   - test
 
 variables:
-  BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
-  BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-checkout
+  BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-bitbake
+  BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-checkout
 
 include:
-  - project: 'olp/edge/ota/connect/client/meta-updater'
-    ref: 'master'
-    file: 'scripts/ci/gitlab/docker.yml'
-  - project: 'olp/edge/ota/connect/client/meta-updater'
-    ref: 'master'
-    file: 'scripts/ci/gitlab/checkout.yml'
-  - project: 'olp/edge/ota/connect/client/meta-updater'
-    ref: 'master'
-    file: 'scripts/ci/gitlab/tests.yml'
+  - local: "scripts/ci/gitlab/docker.yml"
+  - local: "scripts/ci/gitlab/checkout.yml"
+  - local: "scripts/ci/gitlab/tests.yml"
 
 Docker setup:
-  extends: .bb_docker_remote
+  extends: .bb_docker_local
 
   stage: docker
+  variables:
+    BITBKAE_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
+    BITBAKE_CHECKOUT_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-checkout
   except:
     - pushes
 
@@ -30,7 +27,7 @@ Checkout:
 
   stage: checkout
   variables:
-    MANIFEST: zeus
+    MANIFEST: master
     CURRENT_PROJECT: meta-updater
   except:
     - pushes
@@ -74,6 +71,8 @@ Oe-selftest qemux86_64:
   except:
     - pushes
 
+# Not run by default, triggered on nightlies
+
 Oe-selftest minnowboard:
   extends: .oe-selftest
 
@@ -83,6 +82,9 @@ Oe-selftest minnowboard:
     OE_SELFTESTS: 'updater_minnowboard'
   except:
     - pushes
+  only:
+    variables:
+      - $OE_MINNOWBOARD
 
 Oe-selftest rpi:
   extends: .oe-selftest