summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml28
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:
4 - test 4 - test
5 5
6variables: 6variables:
7 BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-bitbake 7 BITBAKE_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-bitbake
8 BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-master-checkout 8 BITBAKE_CHECKOUT_IMAGE: ${CI_REGISTRY_IMAGE}:ci-${CI_COMMIT_REF_SLUG}-checkout
9 9
10include: 10include:
11 - project: 'olp/edge/ota/connect/client/meta-updater' 11 - local: "scripts/ci/gitlab/docker.yml"
12 ref: 'master' 12 - local: "scripts/ci/gitlab/checkout.yml"
13 file: 'scripts/ci/gitlab/docker.yml' 13 - local: "scripts/ci/gitlab/tests.yml"
14 - project: 'olp/edge/ota/connect/client/meta-updater'
15 ref: 'master'
16 file: 'scripts/ci/gitlab/checkout.yml'
17 - project: 'olp/edge/ota/connect/client/meta-updater'
18 ref: 'master'
19 file: 'scripts/ci/gitlab/tests.yml'
20 14
21Docker setup: 15Docker setup:
22 extends: .bb_docker_remote 16 extends: .bb_docker_local
23 17
24 stage: docker 18 stage: docker
19 variables:
20 BITBKAE_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-bitbake
21 BITBAKE_CHECKOUT_IMAGE_MASTER: ${CI_REGISTRY_IMAGE}:ci-master-checkout
25 except: 22 except:
26 - pushes 23 - pushes
27 24
@@ -30,7 +27,7 @@ Checkout:
30 27
31 stage: checkout 28 stage: checkout
32 variables: 29 variables:
33 MANIFEST: zeus 30 MANIFEST: master
34 CURRENT_PROJECT: meta-updater 31 CURRENT_PROJECT: meta-updater
35 except: 32 except:
36 - pushes 33 - pushes
@@ -74,6 +71,8 @@ Oe-selftest qemux86_64:
74 except: 71 except:
75 - pushes 72 - pushes
76 73
74# Not run by default, triggered on nightlies
75
77Oe-selftest minnowboard: 76Oe-selftest minnowboard:
78 extends: .oe-selftest 77 extends: .oe-selftest
79 78
@@ -83,6 +82,9 @@ Oe-selftest minnowboard:
83 OE_SELFTESTS: 'updater_minnowboard' 82 OE_SELFTESTS: 'updater_minnowboard'
84 except: 83 except:
85 - pushes 84 - pushes
85 only:
86 variables:
87 - $OE_MINNOWBOARD
86 88
87Oe-selftest rpi: 89Oe-selftest rpi:
88 extends: .oe-selftest 90 extends: .oe-selftest