1 files changed, 15 insertions, 22 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b22e20..d08a7e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,21 +4,24 @@ stages:
   - test
 
 variables:
-  BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-bitbake
-  BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-checkout
+  BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
+  BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-checkout
 
 include:
-  - local: "scripts/ci/gitlab/docker.yml"
-  - local: "scripts/ci/gitlab/checkout.yml"
-  - local: "scripts/ci/gitlab/tests.yml"
+  - 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'
 
 Docker setup:
-  extends: .bb_docker_local
+  extends: .bb_docker_remote
 
   stage: docker
-  variables:
-    BITBKAE_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
-    BITBAKE_CHECKOUT_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-checkout
   except:
     - pushes
 
@@ -27,7 +30,7 @@ Checkout:
 
   stage: checkout
   variables:
-    MANIFEST: master
+    MANIFEST: warrior
     CURRENT_PROJECT: meta-updater
   except:
     - pushes
@@ -39,10 +42,6 @@ Build core-image-minimal:
   variables:
     TEST_BUILD_DIR: 'build-core-image-minimal'
     BITBAKE_TARGETS: 'core-image-minimal'
-  artifacts:
-    name: "core-image-minimal_$CI_COMMIT_REF_SLUG"
-    paths:
-      - $TEST_BUILD_DIR/tmp/deploy/images/*/core-image-minimal*
   except:
     - pushes
 
@@ -56,8 +55,6 @@ Oe-selftest qemux86_64:
   except:
     - pushes
 
-# Not run by default, triggered on nightlies
-
 Oe-selftest minnowboard:
   extends: .oe-selftest
 
@@ -67,9 +64,6 @@ Oe-selftest minnowboard:
     OE_SELFTESTS: 'updater_minnowboard'
   except:
     - pushes
-  only:
-    variables:
-      - $OE_MINNOWBOARD
 
 Oe-selftest rpi:
   extends: .oe-selftest
@@ -80,9 +74,8 @@ Oe-selftest rpi:
     OE_SELFTESTS: 'updater_raspberrypi'
   except:
     - pushes
-  only:
-    variables:
-      - $OE_RPI
+
+# Not run by default
 
 Ptest qemux86_64:
   extends: .oe-selftest